Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 3 Nov 2013 16:53:11 +0000 (3 17:53 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 3 Nov 2013 16:53:11 +0000 (3 17:53 +0100)
1  2 
lisp/org-element.el
testing/lisp/test-org-element.el

Simple merge
Simple merge