Merge branch 'maint'
commitb13135c2935fb9abcac6939743a3da1563c4a730
authorBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 17:46:23 +0000 (3 19:46 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 17:46:23 +0000 (3 19:46 +0200)
treef3ba225fc56f492d89d53eaae29f680b22adf8dd
parent7046ad18eeffe5940a83cfa971b53808719f7711
parenta42c099a26d59bd0c123c701c3c4557aa964a2a8
Merge branch 'maint'
lisp/org.el