Merge branch 'maint'
commit1f7b3101429c46148cdf880e6f20db5aaed8fb76
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 14 May 2013 17:01:20 +0000 (14 19:01 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 14 May 2013 17:01:20 +0000 (14 19:01 +0200)
treeb5ccd5d4853b9193d1c2ac152f11b39750905d5b
parentad1e98a23c4149653b5c4a4dcdaa4fa923e3c761
parentf371e5da0d67c6844ff7ab509f1ae5fc402d20a6
Merge branch 'maint'
lisp/ox-html.el