| commit | b134c60454bc8db5bcf054008b4652a380c6a02d | |
| author | Bastien Guerry <bzg@altern.org> | |
| Mon, 1 Oct 2012 15:56:11 +0000 (1 17:56 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Mon, 1 Oct 2012 15:56:11 +0000 (1 17:56 +0200) | ||
| tree | 6bf936c43cd92d07cfc995275d5e0aeb24fad8cc | treesnapshot (tar.gz zip) |
| parent | 7f74da3f2290af21b44e5139e19362f1e5068cb5 | commitdiff |
| parent | ffdb6fb159b0a1ac4f32749d70c511e6f7e77148 | 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 |