Merge branch 'maint'
commit3056abe7816af7f1fb541fe3793bb1b30d6b69ad
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 24 Sep 2017 08:58:43 +0000 (24 10:58 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 24 Sep 2017 08:58:43 +0000 (24 10:58 +0200)
tree5ffe44129744f276095143912bfb19932899f169
parent039004ddee7cd7163dccf4b7af6e562ae6e32311
parentd40deb6967dd7d2369576319cd1c517e1c454b95
Merge branch 'maint'
lisp/ox-publish.el
testing/lisp/test-ox-publish.el