Merge branch 'hotfix-7.8.06'
commit57f8bbf7eab8dbdb906fdb9364705ed5ec50dd94
authorBastien Guerry <bzg@altern.org>
Wed, 28 Mar 2012 00:05:43 +0000 (28 02:05 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 28 Mar 2012 00:05:43 +0000 (28 02:05 +0200)
treec95c2ec9eecb7dd165fcf012ea385751a390cc3a
parentd0a7d7cdddb2d4747781f67e723033510a70e35d
parent8ab92f8b55436d6d8b64080cc64d3011fdbcaa6e
Merge branch 'hotfix-7.8.06'
lisp/org.el