Merge branch 'maint'
commit8a7fe3c2193fd82fc238df6e20eaf6ce0d8e3fab
authorBastien <bzg@gnu.org>
Thu, 23 Mar 2017 22:49:11 +0000 (23 23:49 +0100)
committerBastien <bzg@gnu.org>
Thu, 23 Mar 2017 22:49:11 +0000 (23 23:49 +0100)
tree4f37b47b00f8d35cc83b8bb76b6f4d286f6ff5b4
parentd5bbf365533ba45d72ebed8121c7612c860ea944
parente3ed81c98dc57463fad151adbded892e3654d9bf
Merge branch 'maint'
lisp/ox-html.el