Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 21 May 2013 10:40:52 +0000 (12:40 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 21 May 2013 10:40:52 +0000 (12:40 +0200)
commitf1b99adbaffb6ad9979b706f0d6a9de268213a2b
treef31269821fb8b35e153177c264352b5b79754ee9
parentbb9233ef8a20fd184c617c6f1ddb9546e52b1473
parent030e9689821eaad6b1f4caaa6eeac0fcc74068e4
Merge branch 'maint'
lisp/org-clock.el