Merge branch 'maint'
commit8e9c10ada453c1964e9e52d2badb8181732ddbde
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 9 Jun 2013 09:30:51 +0000 (9 11:30 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 9 Jun 2013 09:30:51 +0000 (9 11:30 +0200)
treed6ffcb86964d13f027f6f868b95482d5c00df5a8
parentefccedbf653d1edabc923c6b8723578cebffc00d
parent56b864b265ea25110a0e3afa85c178bd5edbb84e
Merge branch 'maint'
lisp/ox-html.el