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)
commitf51a72c95c3368617f82286cd107008b714dc38e
treed71d6215b9e4a0f7ca22b0d370ffbd83358461da
parenta4a1d85ed0d62e7713d515b967b1bc1580ec398d
parent2de0c1c3da1e7f9859b82d8af0167c60545c5c5f
Merge branch 'maint'

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