Merge branch 'maint'
commit82dc8f01ced0af8ad3617f6770a0439988d79737
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 12 Sep 2012 13:46:12 +0000 (12 15:46 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 12 Sep 2012 13:46:12 +0000 (12 15:46 +0200)
treef368ed4da893aa7af3c4ce637bdcb5c6ffc58ef0
parent59d0f3052289c84784f778f1a1eb66f9584ac50c
parentf969e24a4317eac2f3a7c14c565ae260f2877e3a
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el