Merge branch 'maint'
commit2668d9e9cecce37d5598275fce380842f5a4a28c
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 24 Oct 2013 15:22:26 +0000 (24 17:22 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 24 Oct 2013 15:22:26 +0000 (24 17:22 +0200)
tree3a5eaec7cb966c766b283f32576777ecdf44e5c1
parent5a78f12866e94d435bce541b05a2dc198eccdb97
parentff172be293bb3408fceefb27ac75716878182aae
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el