| commit | e56ea43008c4a2695341232c60e06813bbdba8a4 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Mon, 28 Jul 2014 16:22:29 +0000 (28 18:22 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Mon, 28 Jul 2014 16:22:29 +0000 (28 18:22 +0200) | ||
| tree | fbc4172ecff156b7fa15912a801a8b3e629ec201 | treesnapshot (tar.gz zip) |
| parent | 7f21cfc65802d30b2de19899c6e193eba9b83e3f | commitdiff |
| parent | 6efe8eacf01cec920638e7f85977c94da9366094 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-agenda.el
Conflicts:
lisp/org-agenda.el
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |