Merge branch 'maint'
commit7046ad18eeffe5940a83cfa971b53808719f7711
authorBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 15:03:28 +0000 (3 17:03 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 15:03:28 +0000 (3 17:03 +0200)
tree0adbdf1972b3a326785edcbe16eefe3a4bb18310
parent74974ab34b7cf31add28cdb3f6d9fce8009eda34
parent19af726090b0239dfe1dc193ab19316af9324bbc
Merge branch 'maint'
lisp/org.el