Merge branch 'maint'
commit0b13ec8c1b5a7aceaa7a2a40a5a93194f023626b
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 13 Sep 2012 11:17:17 +0000 (13 13:17 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 13 Sep 2012 11:17:17 +0000 (13 13:17 +0200)
treef79341420abee3d4632b49daff2e8633546c41a7
parent6589b9925c1d4bef64b848af25b7037ab81104d1
parent4a7c99134c3c43e036f75cb3b9826a95e3a5b6fc
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el