Merge branch 'maint'
commit886e4f56e53ba29919aefafcd9659610f18d4fa2
authorBastien Guerry <bzg@altern.org>
Wed, 24 Oct 2012 09:21:48 +0000 (24 11:21 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Oct 2012 09:21:48 +0000 (24 11:21 +0200)
tree29ba15302d60600fa0beb2fca15d2558a5fc2a68
parent866d28d48e8e8628a36bb550230f3a185cb4e564
parentfacb889b196e7e5f8bf8a93395a6eec01f539a01
Merge branch 'maint'
lisp/org-clock.el