Merge branch 'maint'
commit914f3f88a7ba046692e13a03f4a0335b5a221a9e
authorBastien Guerry <bzg@altern.org>
Fri, 3 Jan 2014 16:38:19 +0000 (3 17:38 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 3 Jan 2014 16:38:19 +0000 (3 17:38 +0100)
treeed4f959328c89106cfc93ea939f16a9c9944a3d2
parent62375dc3e5b74154b9057c8fc6bd873c4018f37c
parentbee871762ced33961586aceb721922fe3671417f
Merge branch 'maint'
lisp/org.el