Merge branch 'maint'
commit5d1683490652d558b099425ce65c9a8ce75a4cf1
authorBastien Guerry <bzg@altern.org>
Thu, 30 Aug 2012 08:33:33 +0000 (30 10:33 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 30 Aug 2012 08:33:33 +0000 (30 10:33 +0200)
tree5e66f9a0967064c9aba5d56ff28f8ffb7985f607
parente72acc0e1f7d501c40a9c48479050625f7b73317
parent1e678d8cbac5819bef47ed5712e05f4f08630025
Merge branch 'maint'
lisp/org.el