Merge branch 'maint'
commitacb00702d57a6cc2f7e4bc7db2587b2d9a3ab042
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 25 Jun 2013 15:38:43 +0000 (25 17:38 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 25 Jun 2013 15:38:43 +0000 (25 17:38 +0200)
tree4e144fc58b2f96ba6dcd999a7f9a7d0115e779f7
parentec8f3f987ec46044975557a352dd491f107ff60b
parent838e849bf785bef78fb44c50c9bc4bf86f3cb579
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el