Merge branch 'maint'
commit214ef7d461399d5495f404b03a127e38c7e1b4f4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Jul 2014 13:24:45 +0000 (25 15:24 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Jul 2014 13:24:45 +0000 (25 15:24 +0200)
tree31b6b3bb9140c387bf7738cdae6ab3f2f8e6a746
parentb15a9c0c1c535159f2e93907174d88f1bcffdc56
parent0e01e3eb13ab4045be51395f98c2d20d5dbaee1d
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el