Merge branch 'maint'
commit3733658bb52ae510780629bd80f82e069bf84865
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 19 Aug 2015 13:23:47 +0000 (19 15:23 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 19 Aug 2015 13:23:47 +0000 (19 15:23 +0200)
treeeadc3d6b54f79be08c3fee23a2a49cb7ef47b72a
parentc5cbc6936ec0b08ff6060b59b7b9fab3c9cb5120
parent93b73bd3032bf03f129c81fb199fbaeb31a772a3
Merge branch 'maint'
lisp/org-element.el
lisp/org.el
testing/lisp/test-org-element.el