Merge branch 'maint'
commit90aae1e2e8112a24d998e9b6213420815646e9e2
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 1 Sep 2012 20:57:19 +0000 (1 22:57 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 1 Sep 2012 20:57:19 +0000 (1 22:57 +0200)
tree2726cc1ea9850e1f41fa4d75c7cf6a6c329f87ef
parentef3706ba925c4b58097e3987c66b46511e60a1f7
parent8d09d1aaa9534d63d40f27c79737ab89664b4e3b
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el