Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 2 Sep 2014 10:34:47 +0000 (12:34 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 2 Sep 2014 10:34:47 +0000 (12:34 +0200)
Conflicts:
lisp/org.el

1  2 
lisp/org.el
testing/lisp/test-org-element.el

diff --cc lisp/org.el
index 2b3d00a,1a6d028..f343a69
mode 100755,100644..100755
Simple merge