Merge branch 'maint'
commit6cdf1b6d3f1d04ab22e71500275a0853577976cc
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 15 May 2014 11:45:38 +0000 (15 13:45 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 15 May 2014 11:45:38 +0000 (15 13:45 +0200)
tree25800a69c30f7daf241897227de5be7e18d03da8
parent7893cddc883eb6fd0f6d9050a4d29078898deb57
parentab1ce2a757000f7d8a66de023051c13ddc9705ec
Merge branch 'maint'
lisp/ox-html.el