Merge branch 'maint'
commitfe8bfb8bd931fda3be2451267c9a1ffbdff064ba
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 8 Jul 2013 20:27:35 +0000 (8 22:27 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 8 Jul 2013 20:27:35 +0000 (8 22:27 +0200)
tree79746d33f84377f0a82dad599e3d8ddb8fba5dd0
parentfdaa996e90b20ff7a052736d2d7bda5140cbb861
parenteb37142b14fba90e492ef910026bcadfa5b0aa9b
Merge branch 'maint'
lisp/ox-html.el