| commit | 0a21f829627084445edd1895c6c1f3467b72ad73 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sat, 2 Mar 2013 17:59:47 +0000 (2 18:59 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sat, 2 Mar 2013 17:59:47 +0000 (2 18:59 +0100) | ||
| tree | 960e1099dcfccfc01818d42d245943e304e99541 | treesnapshot (tar.gz zip) |
| parent | 6bc6a361b0b9c634a0061e4ce4c33216c0dc4695 | commitdiff |
| parent | 3b21f246d6f00671e28b82bf963f259febd41573 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-clock.el
Conflicts:
lisp/org-clock.el
| lisp/org-clock.el | diff1 | diff2 | blobhistory |