Merge branch 'maint'
commit3149a0151309f13caef7b04b8ea31965aac2fc28
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Mar 2016 15:17:51 +0000 (30 17:17 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Mar 2016 15:17:51 +0000 (30 17:17 +0200)
tree07ab95fc8ccf693ed74cf259dc9af6b1c66b41cf
parentd5b9c7443085f73dc4df8a22d1470509ffb2b4fd
parentcb683e3a5693cf631e8d6625f11202f356989033
Merge branch 'maint'
lisp/ox-html.el