Merge branch 'maint'
commitf4b0fb3dee410206cf36eaa2199b8cabe6c86fe7
authorBastien Guerry <bzg@altern.org>
Thu, 13 Mar 2014 14:50:35 +0000 (13 15:50 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 13 Mar 2014 14:50:35 +0000 (13 15:50 +0100)
tree21e8fe6089b61b05540a24ac248858e0790e1003
parente2b6c506c28540943c9802a46500c940baa793be
parent7f65ba52eed64a4402b39f46bc852c6fb1291884
Merge branch 'maint'
lisp/org.el