| commit | b622300c0cbd89453a00cc052749342d87717595 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Mon, 26 May 2014 13:32:13 +0000 (26 15:32 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Mon, 26 May 2014 13:32:13 +0000 (26 15:32 +0200) | ||
| tree | 771787aa5a1bf813ece5406244015066940eb6aa | treesnapshot (tar.gz zip) |
| parent | 319b09a1c4af478a953112cc31602553d69808ce | commitdiff |
| parent | cbce904187f6a58ea99b1470dac9444496d25aea | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-agenda.el
Conflicts:
lisp/org-agenda.el
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |