Merge branch 'maint'
commit929b65533a739c9214df4bedc4900fac70456019
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 19 Jan 2018 17:31:48 +0000 (19 18:31 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 19 Jan 2018 17:31:48 +0000 (19 18:31 +0100)
tree01143174b3c6b2565281d42acc15ffa63682c404
parent029c890018015bb319a6aa458aa8a79570b0427e
parent63c02666888c7bb7efe1afa70f12b9d53108a5c0
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-colview.el
testing/lisp/test-org-element.el
testing/lisp/test-org-footnote.el
testing/lisp/test-org.el
testing/lisp/test-ox.el