Merge branch 'maint'
commit2a7a4a65adbb1e211363ff43cd82ebd348598de7
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 13 Feb 2018 13:10:28 +0000 (13 14:10 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 13 Feb 2018 13:10:28 +0000 (13 14:10 +0100)
treef5668952098c551cf0421c96c1695e888313bb15
parentc29efc8f912f00db99edc98c113e68a9ef32b507
parent7c21dfc771d2a2f44870c80f34001c835690a77d
Merge branch 'maint'
lisp/org-compat.el
lisp/ox-publish.el
testing/lisp/test-ox-publish.el