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

Simple merge
Simple merge