Merge branch 'maint'
commit855ba428f2148380b0d1934f382524e3669ff91e
authorBastien Guerry <bzg@altern.org>
Mon, 30 Dec 2013 09:44:31 +0000 (30 10:44 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 30 Dec 2013 09:44:31 +0000 (30 10:44 +0100)
tree9230a37c3a11f93e997e02ac9e6e6a44f0e7212e
parent52d34f6cbc372f0f6ae228b691ebd19aad19ec5d
parent4898be673fbd84406a0ad1a67fb103ea2b6be2c9
Merge branch 'maint'
lisp/ox-html.el