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)
1  2 
lisp/org-clock.el

Simple merge