Merge branch 'maint'
commit5660047846bfcfb674abcb32b06d2826d4113518
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 25 Feb 2016 13:42:22 +0000 (25 14:42 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 25 Feb 2016 13:42:22 +0000 (25 14:42 +0100)
tree8e71fadf9a3999417491abd097eaba47aaa4f78b
parent2db95a7755d36ea54c92058681d845128cb19e75
parent54b42f7e598188031895f6109071b30e22ce9e20
Merge branch 'maint'
lisp/org.el