Merge branch 'maint'
commita6f8460487a559f77e49140ce1b1e1e17cbb8eff
authorBastien Guerry <bzg@altern.org>
Thu, 13 Mar 2014 08:46:58 +0000 (13 09:46 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 13 Mar 2014 08:46:58 +0000 (13 09:46 +0100)
tree55a3f4122344cfcc085bd6e3e5b5bf3b0587f7bc
parent99f1ff33f0d918854ecbe64fb19645645a75c068
parentf94ed64ffd8941cb919295e6de63ec67b9c00564
Merge branch 'maint'
lisp/org-src.el