Merge branch 'maint'
commita88bd8778739e75e9d631930d497679d3f6d2633
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 27 Dec 2017 22:57:37 +0000 (27 23:57 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 27 Dec 2017 22:57:37 +0000 (27 23:57 +0100)
treeabdbea3f7197b51f41be34127ccd2503b22a5844
parent01e150eb59d06969fc5d08319a622d130934a9d3
parentff0f3e472348fbd3773905b87baa7419df86248f
Merge branch 'maint'
lisp/org.el