Merge branch 'maint'
commit0bab94dedf0bd883d2fc0fe063e52ba9f9ad31ae
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 5 Jul 2013 22:41:04 +0000 (6 00:41 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 5 Jul 2013 22:41:04 +0000 (6 00:41 +0200)
tree1c2950373c09b4750f11e49c44dbdeadd4383a2f
parentacb351444e31da6038c86767be3d248159164f32
parent0aa0fdd9713cd06cf18bc3827416aeb26d2b4cc6
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el