Merge branch 'maint'
commitd6fb245590d4f3738486af03cb19998ae7e8ad96
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 30 Sep 2012 11:13:21 +0000 (30 13:13 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 30 Sep 2012 11:13:21 +0000 (30 13:13 +0200)
tree14382f7a5b336b922af3e9361799f03ec3567f69
parentde65b50612924ec2f841f0d2c0baa1f85e7eef24
parent1ad58a8230694fefb5a7cb867b9e6c8dbed50cbc
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org.el