Merge branch 'maint'
commit5e3c3f93bf4c770045f292037ce817b185211b86
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 17 Jun 2013 15:17:24 +0000 (17 17:17 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 17 Jun 2013 15:17:24 +0000 (17 17:17 +0200)
tree65ce44c5bd1f2978145c6cef752dfa1e406ec990
parent0e354321f5f099de688022066b9e72caa55fc0b6
parentdffdc499ea60732599ef60db79d804e79ea30202
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el