Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 13:18:24 +0000 (14:18 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 13:18:24 +0000 (14:18 +0100)
commita2febd210182d9e1a37b0d7fd9ee007a10abc4bc
tree1cb1b3e1add7b4b1a6fadd39204affbb495d89a0
parent394398afab047382f529baa94ed264dc3882d54d
parent4259ea9fe5ace9436a51fddd3734665c2c3f0732
Merge branch 'maint'
lisp/org-clock.el