Merge branch 'maint'
commitc33e04dcf2e94b5b5527f0617bd75fd35a7dab54
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 30 Aug 2013 12:22:07 +0000 (30 14:22 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 30 Aug 2013 12:22:07 +0000 (30 14:22 +0200)
treef0e1f2f3f66961546d00e5fbf09ae133ba0f01fe
parenteaa458594f017640c8102a29daa686df5dce81b1
parent026b99ecb86e08f4fdc7b45ee2bfa1d4c84a37f6
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el