Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 Aug 2014 19:52:17 +0000 (21:52 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 Aug 2014 19:52:17 +0000 (21:52 +0200)
commit88101ef43499bbd246bfff9e5865e653a54a8239
treee541dc54217c09461baaddc26534e237c12826fb
parentcc6aa45f3b41d73eddca21b67d487e47dc4d7433
parentc1bc68550097416b7434e513df3080133e52d578
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el