Merge branch 'maint'
commit52d34f6cbc372f0f6ae228b691ebd19aad19ec5d
authorBastien Guerry <bzg@altern.org>
Mon, 30 Dec 2013 09:37:33 +0000 (30 10:37 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 30 Dec 2013 09:37:33 +0000 (30 10:37 +0100)
tree87ce22be708cabcd911e3f5f856a71a0a6c85089
parentc8bb89facaab20dd762c9c04286a2e61cd502c30
parent1813200fc81fa5e0f248407d852f3771fe2d4f6e
Merge branch 'maint'
lisp/ox-html.el