Merge branch 'maint'
commit0c691737aadfe645a2bb4891e206f6340c9ed6c0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 4 Dec 2017 07:24:19 +0000 (4 08:24 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 4 Dec 2017 07:24:19 +0000 (4 08:24 +0100)
tree9deb27c453ba584238186262e9f9ec20eae857c9
parenta0e3f1d5050ffd0d03c68b35b2b5300fb89da1f0
parente22ee8b8a39933c8d662894a3b96b07337c4f536
Merge branch 'maint'
lisp/ox-html.el