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

Simple merge
Simple merge