| commit | b8104315d3abfdd385fa5c3d1900e08ffe30fa27 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 22 Jan 2013 21:28:47 +0000 (22 22:28 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 22 Jan 2013 21:28:47 +0000 (22 22:28 +0100) | ||
| tree | dd0494737918ff1f970cbdb0c95e51b8d43f170f | treesnapshot (tar.gz zip) |
| parent | 196c5797d20e13c122097d1e3d3adf0969c8e59b | commitdiff |
| parent | 62c3107eb2dfa7a75fae13da151eafb7535b8ab6 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-agenda.el
Conflicts:
lisp/org-agenda.el
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |