Merge branch 'maint'
commit5508053d6334ff91f5122cf3797ee3dc3367982c
authorBastien Guerry <bzg@altern.org>
Tue, 11 Dec 2012 17:14:00 +0000 (11 18:14 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 11 Dec 2012 17:14:00 +0000 (11 18:14 +0100)
treeb29fe7691eecb10c00fa85d15995e2fe5a61233a
parentb1f36921d71de646bb95059156fc6232c044e01c
parent7f0e7cb9b98d6ad1ab6e559fef81c1394f0a748c
Merge branch 'maint'
lisp/org-agenda.el
lisp/org-clock.el
lisp/org-table.el
lisp/org.el