Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 25 Feb 2014 19:54:48 +0000 (20:54 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 25 Feb 2014 19:54:48 +0000 (20:54 +0100)
commit3960ed07e626110bc81396c91e309e7a2a855e1c
tree270c0d2f0b681c8695b2040b4c0582032c4e260d
parent66f3ba38c2b08dea909d2bfdef7b9cd997e5b613
parent7f8c1226e860b34a5260b7a39e00e65cd81be926
Merge branch 'maint'

Conflicts:
lisp/org-element.el
lisp/org-element.el
testing/lisp/test-org-element.el