Merge branch 'maint'
commit8285ff4cf24c9a99b2922ce6993e269c7c9990af
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Jun 2016 22:10:14 +0000 (28 00:10 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Jun 2016 22:24:50 +0000 (28 00:24 +0200)
tree3acffc914be581d23734656134f38a87ed792b07
parentd4408684e1e2f508dce2ae8c71d2db827d2671c6
parentf196fb3bed2cf9156d485315d46d193cc877b6aa
Merge branch 'maint'
lisp/org-element.el
lisp/ox.el
testing/lisp/test-ox.el