| commit | 367d48cbd8b55f2e765ecc8f5c0ff47ca7e580c0 | |
| author | Bastien <bzg@gnu.org> | |
| Mon, 27 Apr 2015 12:17:00 +0000 (27 14:17 +0200) | ||
| committer | Bastien <bzg@gnu.org> | |
| Mon, 27 Apr 2015 12:17:00 +0000 (27 14:17 +0200) | ||
| tree | e1397dc18df41ba0ed06427f1b07e611969e801c | treesnapshot (tar.gz zip) |
| parent | d13a2bb1c7f6cb4ef12d67d5fb85d479d4382788 | commitdiff |
| parent | 9ee9d69a34e98f69e006fa4e68b02ed6f43f3dbf | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-clock.el
Conflicts:
lisp/org-clock.el
| lisp/org-clock.el | diff1 | diff2 | blobhistory |