Merge branch 'maint'
commitaf7ea548b038be656e37adcb655d871de13b58d9
authorBastien <bzg@gnu.org>
Mon, 17 Aug 2015 18:43:03 +0000 (17 20:43 +0200)
committerBastien <bzg@gnu.org>
Mon, 17 Aug 2015 18:43:03 +0000 (17 20:43 +0200)
treee60712e2a2384c25c851fca00745e45478dd738f
parent40b4ef3345a548d0d1046163f3b162eafc09b6f2
parenta03cd64994b88913c56ae8534d4b5479ef852809
Merge branch 'maint'
lisp/org.el