| commit | 71f2befb6126162af2e6efb7bad4cf41af099d9d | |
| author | Bastien Guerry <bzg@altern.org> | |
| Fri, 11 Jan 2013 16:19:52 +0000 (11 17:19 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Fri, 11 Jan 2013 16:19:52 +0000 (11 17:19 +0100) | ||
| tree | 3b4c9ae503551370cd60a2db8444cae03c20e830 | treesnapshot (tar.gz zip) |
| parent | 9265513c5e8d0a28a575f1135e890a1ba8f8d554 | commitdiff |
| parent | 3c4df588e85da0deb64f516fac089a0368fae960 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-agenda.el
Conflicts:
lisp/org-agenda.el
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |