Merge branch 'maint'
commitb72d29d685b5abe747466854151977b2c632cb1c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 13 May 2017 07:21:31 +0000 (13 09:21 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 13 May 2017 07:21:31 +0000 (13 09:21 +0200)
treec553ed29611437efa8d431491967e66f0c36d56b
parent79ac71d175aa0492cc7a58c05ed23539ca8959bc
parentc0369a798470763f8f3c69cf2079c3a194635feb
Merge branch 'maint'
lisp/org-element.el
lisp/org.el
testing/lisp/test-org-element.el