Merge branch 'maint'
commit35842c7362452135050291e6d68177ccbf723c70
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 20 Oct 2013 09:00:57 +0000 (20 11:00 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 20 Oct 2013 09:00:57 +0000 (20 11:00 +0200)
treece2d57fea9623d5d324a326ad5c3102f0cd00178
parentaf80144976cef9e5630a33f85f05a8dfc07f55d4
parente5cecc5d341e8d44f29fdd3d27d0441010f8907a
Merge branch 'maint'
lisp/ox-ascii.el
lisp/ox-html.el
lisp/ox-md.el