Merge branch 'maint'
commit9bb4dd6e0af07c553f1fadabebd86e3fadb51ade
authorBastien Guerry <bzg@altern.org>
Thu, 20 Mar 2014 08:45:09 +0000 (20 09:45 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 20 Mar 2014 08:45:09 +0000 (20 09:45 +0100)
tree8f91a916563c8aefd4db122db75708e9ed5e721c
parent5d0e7068365c8274d0d7884f82f3c240baeda5fb
parent8bab38bcbaab036a7c2c969a252cbb8ba41f101d
Merge branch 'maint'
lisp/org-clock.el