Merge branch 'maint'
commitacb351444e31da6038c86767be3d248159164f32
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 5 Jul 2013 19:14:43 +0000 (5 21:14 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 5 Jul 2013 19:14:43 +0000 (5 21:14 +0200)
treea326622bd7f67be48e9905a47fad591de36a7a5e
parentfaabe2f1eb58d8c9de0150ce36012fe5b95243d2
parente5630add2768bee27351fcec06cb395aa9e61d31
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el