Merge branch 'hotfix'
commit8c4ccab0285781d22993e064cad47474bbf03379
authorBastien Guerry <bzg@altern.org>
Tue, 10 Apr 2012 23:14:39 +0000 (11 01:14 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 10 Apr 2012 23:14:39 +0000 (11 01:14 +0200)
tree3a03302d2a7ad49383f62932262e231007486acc
parent5adb7638fe5ab325ba5483cd22df050cbdb24dab
parent3523533e502f62259c982ac6efaf30fd5962fa64
Merge branch 'hotfix'
lisp/org-clock.el