Merge branch 'maint'
commit7df5d21f794900676b6e33ad425c4417c3bea144
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Oct 2017 10:30:59 +0000 (14 12:30 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Oct 2017 10:30:59 +0000 (14 12:30 +0200)
tree1e50da26b6a3523df9520ac81219b815794cf694
parent4ffddc2a939d2157d1c8e59e949fd6b8e57eb8a6
parent827af5987348665edd4a632e827925b947c00f96
Merge branch 'maint'
lisp/ox-html.el
lisp/ox-md.el
lisp/ox-texinfo.el
lisp/ox.el
testing/lisp/test-ox.el