Merge branch 'maint'
commit754195477f361b15dcb2559c07cdfffde57b9abf
authorBastien Guerry <bzg@altern.org>
Thu, 30 Aug 2012 11:23:53 +0000 (30 13:23 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 30 Aug 2012 11:23:53 +0000 (30 13:23 +0200)
treeff4354da3fc3e99b6fc8868d2515b19b782d8860
parent910291da3bdf69aea6cba4ed8742371b9657c5bd
parent93fcfe4d36b4f26b213a56bcb0f908f3eef29fb9
Merge branch 'maint'
lisp/org-agenda.el