Merge branch 'maint'
commitdcad3499af19956f6a2bb2829fe81bc1509eb6ab
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 25 Jan 2017 16:58:54 +0000 (25 17:58 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 25 Jan 2017 16:58:54 +0000 (25 17:58 +0100)
tree672d8dcd565efde7587f7435c7711bc03d87a681
parent2348d1834351b57d5ff9bbdb2c74c3e69ed60cfb
parentb6b1e35f33093f45df1e8973d90889a53b03d53b
Merge branch 'maint'
lisp/ox-html.el