Merge branch 'hotfix-7.8.06'
commitba51d8e9c8744f7e387464f84f9b1a689f88cbaa
authorBastien Guerry <bzg@altern.org>
Wed, 21 Mar 2012 07:27:30 +0000 (21 08:27 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 21 Mar 2012 07:27:30 +0000 (21 08:27 +0100)
tree147d04e2181fdfaf60a331016d856320b7cecac2
parentc4978d6210fa13733b2840be3ad5fdb18d351852
parentd83284b728f37a7dea7dfbb1a3c14f5f84244765
Merge branch 'hotfix-7.8.06'
lisp/org.el