Merge branch 'maint'
commit2c92878470e555a0fec7a46c45c31d750c51cfcd
authorBastien Guerry <bzg@altern.org>
Sat, 28 Jan 2012 14:48:17 +0000 (28 15:48 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 28 Jan 2012 14:48:17 +0000 (28 15:48 +0100)
treee912d02f956fb4a096e8a3af8b1450e2267df1fe
parent952abb2c46a75011d023dee732f14feefcf82fac
parentd9ac2ffa37fe0f7f99890c1be565bb223ce50011
Merge branch 'maint'
lisp/org.el