Merge branch 'maint'
commit06bbbee67a18b92c5f547a687ef302fc8341f25e
authorBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 07:18:19 +0000 (17 09:18 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 07:18:19 +0000 (17 09:18 +0200)
tree74dfb02662df096e849ffebffb80e81b55eaeae2
parent1a910df1c07b00ed7035036a08ce4b2ec7b0d497
parentc3810f71b6fdb4b048636b9b924303ae1e0440b4
Merge branch 'maint'
lisp/org.el