Merge branch 'maint'
commitbdeac998c846988e111d857d2e3252cb5173ecf5
authorBastien Guerry <bzg@altern.org>
Fri, 31 Jan 2014 14:53:54 +0000 (31 15:53 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 31 Jan 2014 14:53:54 +0000 (31 15:53 +0100)
tree4c2a190b8d42f213f1f385fe3570d0cc2d59d28e
parent21ce3296b7fb582617e7bf5689224be9c429f9b0
parentd035a9af6c77deacb102406feb5450fed78a7c25
Merge branch 'maint'
lisp/org.el