Merge branch 'maint'
commitab4023582628e152eaf688a328cee0893fc5d900
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 20 Jun 2013 18:19:55 +0000 (20 20:19 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 20 Jun 2013 18:19:55 +0000 (20 20:19 +0200)
tree323d0143449c5523a0c3d1cda3f22c9bef08f3fe
parenta79fd4be2863a300c88218b40b1adca23d9e1eb8
parentf9ae004aca12f2a6439587434a90f4560309a38e
Merge branch 'maint'
lisp/ox-html.el