| commit | 9448fa263b031cd19c4531658b3308fae05dbb3b | |
| author | Bastien Guerry <bzg@altern.org> | |
| Thu, 17 Apr 2014 09:42:16 +0000 (17 11:42 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Thu, 17 Apr 2014 09:42:16 +0000 (17 11:42 +0200) | ||
| tree | 7eca772099795502beec8a8e5e45fdd57d19dbb9 | treesnapshot (tar.gz zip) |
| parent | fffd055ac5e920e744e350a1ad164494aec9fa91 | commitdiff |
| parent | 1781a63304a2b716bd4c57e62506dbb6cd92535d | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-clock.el
Conflicts:
lisp/org-clock.el
| lisp/org-clock.el | diff1 | diff2 | blobhistory |