Merge branch 'maint'
commit23aa91025973f1bd351f90adab4f85cdaecaaa6c
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 14 Oct 2012 19:51:59 +0000 (14 21:51 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 14 Oct 2012 19:51:59 +0000 (14 21:51 +0200)
tree96afc5fb52d6609e0f81d34830e3d77e425dc2eb
parentc1c0c70c8921550dc790e9f9ac7a56dacb4147bc
parentb7c5cf5d446aeef02bf7970fb463ef813c92b509
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el