Merge branch 'maint'
commit6cc600d074f7fd502cef265b1873f85292ad62cf
authorBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 16:28:38 +0000 (27 17:28 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 16:28:38 +0000 (27 17:28 +0100)
tree61cd4f42254138f564e6deaae94b7dbaa6908793
parent692f053d8067e2314826cfcd3cf4ded7362a8dce
parent01748861d42af99dd6a4c9b2f98a1991011a30bc
Merge branch 'maint'
lisp/org.el