Merge branch 'maint'
commit78d2bd7edcc28e2f5bd5bcde5f8d47ab09f2f0ed
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 5 Oct 2012 13:08:58 +0000 (5 15:08 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 5 Oct 2012 13:08:58 +0000 (5 15:08 +0200)
tree7bee07581d8690ddef7eb4c50928842d3b1ee680
parente5e49ea327c17ea5be9a49558d2f5face5b93797
parentdaf8cf030c21260b2615c303653913cdf2907e00
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el