Merge branch 'maint'
commitf58a8482b4060751b75a4ccf1a2ca63db96543fa
authorBastien Guerry <bzg@altern.org>
Mon, 30 Dec 2013 09:44:57 +0000 (30 10:44 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 30 Dec 2013 09:44:57 +0000 (30 10:44 +0100)
tree87ce22be708cabcd911e3f5f856a71a0a6c85089
parent855ba428f2148380b0d1934f382524e3669ff91e
parent71e2401bb59f432a0d71f8e98621effc41662707
Merge branch 'maint'
lisp/ox-html.el