Merge branch 'maint'
commit5d817df1254b35ce27c6897fe4c130e070fa231b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 11 Feb 2016 08:50:55 +0000 (11 09:50 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 11 Feb 2016 08:50:55 +0000 (11 09:50 +0100)
tree740151c13f49f0ea9422d5aa774b08cf964cefbc
parent90ec88d71cc186433b915ac4a6df8be3be65b142
parent9f737bdf1408d29a618cdab71eefe379b9f13476
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el