Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 6 Nov 2013 15:12:57 +0000 (16:12 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 6 Nov 2013 15:12:57 +0000 (16:12 +0100)
1  2 
lisp/ox-html.el

diff --cc lisp/ox-html.el
Simple merge