Merge branch 'maint'
commitbbb451a7b626ea5f4dfce79540d265297e0bae84
authorBastien Guerry <bzg@altern.org>
Tue, 18 Dec 2012 14:09:54 +0000 (18 15:09 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 18 Dec 2012 14:09:54 +0000 (18 15:09 +0100)
treece3f00936a24bacdf6715b8f121d7bd2f28f10b7
parent4996e5bd8e5fd889784dfa5fa5f011fcd59fb521
parent374efdd63e22215984bf2c8a8c54862788797130
Merge branch 'maint'
lisp/org.el