Merge branch 'maint'
commitdadc875d9fa7c2389efb2ad12a3aea5981ab7f34
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 29 Sep 2012 06:57:08 +0000 (29 08:57 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 29 Sep 2012 06:57:08 +0000 (29 08:57 +0200)
tree808c18061ce82ba75bb04c49c0450ea5a4ccde16
parentf155f5458ee0ac66614b114ac0ff2941640e4b2f
parent9c92312d927314699c72fc17f23e01bcef75601f
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el