Merge branch 'maint'
commitf7b11e5d9e9a2923efa9b24cdf5c2e8eda9857b8
authorBastien Guerry <bzg@altern.org>
Wed, 5 Feb 2014 23:27:47 +0000 (6 00:27 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 5 Feb 2014 23:27:47 +0000 (6 00:27 +0100)
treedded06ae8093612eb9efdb1f08bfaf0d663e88ae
parent059f87f4488ecdf9bf79c88fd484344bab911322
parentf4f3f140accee7c6b18eee806465e847b940e3d9
Merge branch 'maint'
lisp/org.el