Merge branch 'maint'
commit9a4cc3a21e01c2272ea260666936a4aa7f294e18
authorBastien Guerry <bzg@altern.org>
Mon, 21 Apr 2014 17:25:44 +0000 (21 19:25 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 21 Apr 2014 17:25:44 +0000 (21 19:25 +0200)
treea596ab2a5d6c4b4e6aa3f6e5ebe1c80f92a7ed0c
parent77d7138322b6d6e537fc4380aa31dce34410501a
parent47e456d8a6e1c818b820a31f447496b89ed45445
Merge branch 'maint'
lisp/org.el