| commit | d52572d1bc3fd864d47c89899bc8317e6cc6badd | |
| author | Bastien Guerry <bzg@altern.org> | |
| Fri, 18 Apr 2014 14:41:29 +0000 (18 16:41 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Fri, 18 Apr 2014 14:41:29 +0000 (18 16:41 +0200) | ||
| tree | 44e98a0037316c035d16c8a4331d3381ab150bec | treesnapshot (tar.gz zip) |
| parent | 7925d42d43c35093c2a7b943fc44d36043f9786d | commitdiff |
| parent | bcbc97d902b9fe01fa5126313ae08b16ba2421b8 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-clock.el
Conflicts:
lisp/org-clock.el
| lisp/org-clock.el | diff1 | diff2 | blobhistory |