| commit | bd4750f24ac11f444163a4b4457e46a7967a7407 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sun, 24 Feb 2013 18:19:01 +0000 (24 19:19 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sun, 24 Feb 2013 18:19:01 +0000 (24 19:19 +0100) | ||
| tree | 0e6e4dfd8bd5a6cfd317846f5981fb2cd9fabe66 | treesnapshot (tar.gz zip) |
| parent | f51fd88554c64a3b0e9be23a5a134c557406d3fb | commitdiff |
| parent | ac44a7af0629cbc201654807709f4c364fe6ed4d | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-clock.el
lisp/org.el
Conflicts:
lisp/org-clock.el
lisp/org.el
| lisp/org-clock.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |