Merge branch 'maint'
commit2f60dfc1b357cc78b2cb1c94272d2ab90ffcead3
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 12 Mar 2014 08:08:37 +0000 (12 09:08 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 12 Mar 2014 08:08:37 +0000 (12 09:08 +0100)
tree27fe4ae79ab1207929ff787ab02741122e53a3c9
parent081abcd6529e42e726d5518f18a09bdb19b12479
parentcb22a0355f1ccbe13a535df77efe40244a0d1094
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el