Merge branch 'maint'
commit0c4f81dee12a0447799e615bfeb904be14bebbf3
authorBastien Guerry <bzg@altern.org>
Mon, 1 Jul 2013 12:32:27 +0000 (1 14:32 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 1 Jul 2013 12:32:27 +0000 (1 14:32 +0200)
tree7fd60a591605ef9a0a8359e764a3df2f522acbd0
parent683e1db203e1420038763f9b02ad912cecf1252b
parent79ce6174fd79f07562bfb3480fde9312a9c3912f
Merge branch 'maint'
lisp/ox-html.el