Merge branch 'maint'
commiteb5cb33218ab5af58e02e269be32ef404c2ea2f2
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 1 Jan 2014 18:07:31 +0000 (1 19:07 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 1 Jan 2014 18:07:31 +0000 (1 19:07 +0100)
tree15500c583c8ce3410b5fa660b1ecd027a8daf737
parente4386ba22a8fc64cfef3419d5f3134ed6b2c901a
parent1a3591c0e7a7d249257224e27042acb1e6c1c3fc
Merge branch 'maint'
lisp/ox-html.el