Merge branch 'maint'
commite32a4777dfc18eff72f9cf25bd7af5b24ec7b589
authorBastien Guerry <bzg@altern.org>
Sun, 3 Jun 2012 08:29:09 +0000 (3 10:29 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 3 Jun 2012 08:29:09 +0000 (3 10:29 +0200)
treed2e4242f3d68fe0a350a94dc377bc0ef0bedc499
parentec368e844dc13a03991fe783d91123ff8388c54b
parent5968047924c6c31c555d0d0f7b78193e9b299183
Merge branch 'maint'
lisp/org-clock.el