Merge branch 'maint'
commit4962980938c147086b2572e6392506e80a6b0994
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 09:10:18 +0000 (29 11:10 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 09:10:18 +0000 (29 11:10 +0200)
tree77f298955da548a182f4cc1c80b2ce4c26f21ed4
parent97ac24417aad6fe7dc3ce98851f8ecca5bc5593c
parentecbd57effb7f0cac556eccac62a5d4bac8366815
Merge branch 'maint'
lisp/org-agenda.el
lisp/org-element.el
testing/lisp/test-org-element.el