Merge branch 'maint'
commit41b7c46519d0436e7fee0d465509044a2cef020d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 20 Aug 2015 12:05:27 +0000 (20 14:05 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 20 Aug 2015 12:05:27 +0000 (20 14:05 +0200)
tree8c12347ab8bd59ffeb374d66a672f7d2890f3dba
parent5269279bf4b4ab3e12cc8717833893b4ce6064f1
parenta72c58178d68e668e0dcfd9e1b5554a3146ccf07
Merge branch 'maint'
lisp/org.el