Merge branch 'maint'
commit3944547bf21262e938063db5935949795030113f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 14 Sep 2017 12:47:15 +0000 (14 14:47 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 14 Sep 2017 12:47:15 +0000 (14 14:47 +0200)
treeb36a46450227b3edac6fa483e92154d88fb7fd8d
parent657302b97e222abb262070586c56fe5d64355035
parent7584268314c0a59be18dc959b4b9a5e85733aaac
Merge branch 'maint'
lisp/ox-html.el