Merge branch 'maint'
commit11f7fe8408cb1c5fa62d55199c2e0b9e01fd10c9
authorBastien Guerry <bzg@altern.org>
Wed, 16 Apr 2014 22:35:39 +0000 (17 00:35 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 16 Apr 2014 22:35:39 +0000 (17 00:35 +0200)
treee0fd716f8c309e84b21cc637e952180b0cff7020
parent675e8b2b8600fada1b52b7aacf4a8d6001d520b2
parent241764b2d11e1d3b7448e75faf0c44b494a866a2
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el