Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 6 Nov 2013 15:12:57 +0000 (16:12 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 6 Nov 2013 15:12:57 +0000 (16:12 +0100)
commited38714b14861dc1cfa8f31ef74213679b631a45
tree7394d7866a316402e3c78d1642799c386f37d84d
parent17eda87a393d69a47e98d18596e69c75992149d0
parent4c94c4d062ce7aa28bc21301ec34857745029f5c
Merge branch 'maint'
lisp/ox-html.el