Merge branch 'maint'
commit6e61cfc80f7ac18bc89b3fd0cea23519eac6e78a
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 29 Sep 2012 08:16:33 +0000 (29 10:16 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 29 Sep 2012 08:16:33 +0000 (29 10:16 +0200)
treeb32101fae25b326686bd5833eab15b2ea8b55954
parent1702710d5709d8f98c8aedce99d79f8b1881e559
parentd88344d291cfeb2a377674816e739c88f6c91cd3
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el