Merge branch 'maint'
commit84aabd700e453b092ed20920cc22ada02d99c15b
authorBastien Guerry <bzg@altern.org>
Sun, 19 Jan 2014 15:37:42 +0000 (19 16:37 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 19 Jan 2014 15:37:42 +0000 (19 16:37 +0100)
tree291df00358f61426e80716d35b9104056b16bdd2
parentfd877a73809e290a8425b3dced94ae4d5b425cd2
parentf4715f1652bb0ce804d8faa8c1f793ce76293faa
Merge branch 'maint'
lisp/ox.el