Merge branch 'hotfix-7.8.06'
commit2bb3a09d53aeef0010ac9d6acb472bd924f008bf
authorBastien Guerry <bzg@altern.org>
Fri, 23 Mar 2012 21:44:04 +0000 (23 22:44 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 23 Mar 2012 21:44:04 +0000 (23 22:44 +0100)
tree260b41a351b5534be4818e529213b0411631e031
parent6e276f3b4560dba4fde7aa92ff965cc9fad74662
parentce1f368013ff98c0421f58dbe8c9af0d046c8a4f
Merge branch 'hotfix-7.8.06'
lisp/org.el