Merge branch 'hotfix'
commit4f4b817315bf81b99404c081c89424edc2e3e9cc
authorBastien Guerry <bzg@altern.org>
Tue, 10 Apr 2012 16:32:54 +0000 (10 18:32 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 10 Apr 2012 16:32:54 +0000 (10 18:32 +0200)
tree338caa29524bd68f5c0b5606cc2dca8e7292ae28
parente8912e1bd80b15b97bf2907139b314483cc36fb8
parentd4ddcbb8b3b4587fb274a9d0a15c8691a396e416
Merge branch 'hotfix'
lisp/org.el