Merge branch 'maint'
commit7c40e0c6ba503ba3829f14b4d8af6ba9b3e0241d
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 20 Sep 2012 17:14:43 +0000 (20 19:14 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 20 Sep 2012 17:14:43 +0000 (20 19:14 +0200)
treee0efbe9235023e8768b643ae4b1b43b64fc5b5d9
parent7a909d1684dec9e9aeb3e047baffc7a533176b79
parentfd5cc62ca58343e929a0b3c6ca5e7e763c588222
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el