Merge branch 'maint'
commitcf35109ad8be6e34a6fc38ac37a38fc37a7acf08
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 19 Sep 2017 20:01:07 +0000 (19 22:01 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 19 Sep 2017 20:01:07 +0000 (19 22:01 +0200)
tree0c712b39a1cffe16a889cd890a37e12f7ff9700a
parent6e7d1526993e7ea8f1359627649ec7944708a42c
parentdb1dab8abe41eb052aac8428262482f6c3974880
Merge branch 'maint'
lisp/ox-html.el