Merge branch 'maint'
commitce8819f18d9d2be000fb70fc4d74b5d96fe07a83
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 23 Nov 2012 22:49:19 +0000 (23 23:49 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 23 Nov 2012 22:49:19 +0000 (23 23:49 +0100)
treef70a064cddb30d637dcb9ac01874d0b116d39821
parentf71df7dc508020b60697c1c31144f31fc27ce4f2
parent89b8a8ca6daa3ccafa818a7085620eeee1ab9752
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el