| commit | bb61df9d911c458ca0b7c1069e49358b7bd404dc | |
| author | Bastien Guerry <bzg@altern.org> | |
| Thu, 12 Jun 2014 13:08:53 +0000 (12 15:08 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Thu, 12 Jun 2014 13:08:53 +0000 (12 15:08 +0200) | ||
| tree | 15a4eb2823a9b9adcc1ed61c89dea587416c3859 | treesnapshot (tar.gz zip) |
| parent | 4014947f31b5603790e6eb82a06673d535acacf4 | commitdiff |
| parent | 2e9c2d7128e0491491d00b585be83ac688587d00 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-agenda.el
Conflicts:
lisp/org-agenda.el
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |