Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 13:17:13 +0000 (14:17 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 13:17:13 +0000 (14:17 +0100)
1  2 
lisp/org-clock.el

Simple merge