| commit | 72d911cfa282b3f14e75b980c19e42d75d00c700 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 3 Apr 2012 12:09:12 +0000 (3 14:09 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 3 Apr 2012 12:09:12 +0000 (3 14:09 +0200) | ||
| tree | 5568ee4b406fa361308f69391a4bcf9b6d448c4b | treesnapshot (tar.gz zip) |
| parent | 64213b8e78a644d027a8c011474924717000df35 | commitdiff |
| parent | e48d67ed6d6a0f352449fbeea6091b6f216c9990 | commitdiff |
Merge branch 'hotfix'
Conflicts:
lisp/org-capture.el
lisp/org-clock.el
Conflicts:
lisp/org-capture.el
lisp/org-clock.el
| lisp/org.el | diff1 | diff2 | blobhistory |