Merge branch 'maint'
commit9be19e32d1a1b8a65f9a06ab3092f867e4da6cec
authorBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 08:39:48 +0000 (20 09:39 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 20 Dec 2012 08:39:48 +0000 (20 09:39 +0100)
treecb432bfef671425ef7a165c78abb7d405dec4e7c
parentbeeb9168dd64d33549ccb54c2931eb0642486faa
parent14ffe22b8fa0190e9b0b5ab0a22dd8ac76f9f003
Merge branch 'maint'
lisp/org.el