Merge branch 'hotfix-7.8.06'
commit3ccefc9fc04b483742bf95c0fc0838608efc82a5
authorBastien Guerry <bzg@altern.org>
Fri, 23 Mar 2012 12:45:26 +0000 (23 13:45 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 23 Mar 2012 12:45:26 +0000 (23 13:45 +0100)
tree43737bd0e8f155c44324982aae5099882630ecc0
parenteb7f7159c9fb0a08bac802a9a2fbe0bd74ea7dab
parent5bb4aabac763aa92fcf227069efd597a9dde0192
Merge branch 'hotfix-7.8.06'
lisp/org.el