Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 31 Aug 2014 09:43:27 +0000 (11:43 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 31 Aug 2014 09:43:27 +0000 (11:43 +0200)
commitd2643be6d8c0e2fd54a673117cf09e332ec18e01
tree6784322391e50a8068ee69206a4c4ff8c156352f
parent851b779d1a3780d921b9c37b81a6afd919f2c479
parent37bf0576f2f2894c6e37239ee8db63a3ef21a840
Merge branch 'maint'

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