Merge branch 'maint'
commit2f48603d7130f5a5dfe3785e7fff8994c5ca186d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 7 Mar 2017 23:15:26 +0000 (8 00:15 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 7 Mar 2017 23:15:26 +0000 (8 00:15 +0100)
tree9c1a2d6c9b30f836032b1ddf6a19d71ba6502e6e
parent38b372e14360349daae0a5ebde82c52475efb117
parent64a5f9a59602f234febeb9ec2391e71e26d17fb4
Merge branch 'maint'
lisp/ox-html.el