Merge branch 'maint'
commit0f512848ea5f6c19a6c1be0ff7df1ad8916a6e57
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 28 Mar 2016 09:07:27 +0000 (28 11:07 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 28 Mar 2016 09:07:27 +0000 (28 11:07 +0200)
tree43d64dd12b2e1258a9c1a425ef7da16b0879acba
parent9438ac6014cf59b66e8e7f50b34e8f747435e0f1
parenta94147535a0115bbd04e080173d4a391b8ca3681
Merge branch 'maint'
lisp/ox-html.el