Merge branch 'maint'
commit818e2a1de76a885bdc207de7c969c93633a2e792
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 16 Mar 2014 09:56:46 +0000 (16 10:56 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 16 Mar 2014 09:56:46 +0000 (16 10:56 +0100)
tree34f5e9ca2527b815a3843281d35ecc10e5a577d9
parente01672c2fb6604954920220628028b5392b8fea4
parentd9dd1e6bd51215a33eb983af869089bd791c145c
Merge branch 'maint'
lisp/ox-html.el