Merge branch 'maint-fixes' into maint
commit54731c965d9ea68f6d7c1ec5b558de9b56d30840
authorBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:20:38 +0000 (23 17:20 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 16:20:38 +0000 (23 17:20 +0100)
treeff8940163ab2a6b21386ba6b8a8bb91930f207f5
parenta118ae4e1c7ddcbdda563735c758f348f9c308d5
parentc800836d7cc22a3c5d9e3d6d2a992641605e5e29
Merge branch 'maint-fixes' into maint
lisp/org.el