| commit | de73b359090468d1846284d1192e89869def1ea3 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 26 Feb 2013 13:36:36 +0000 (26 14:36 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 26 Feb 2013 13:36:36 +0000 (26 14:36 +0100) | ||
| tree | eef94556a4abfe845a9f1083388045b64d5fb147 | treesnapshot (tar.gz zip) |
| parent | 58fc1b4bf44f0b270e8559620722f47c0bb92073 | commitdiff |
| parent | 83bebfd88086688293a06729887eea5852327442 | commitdiff |
Merge branch 'maint'
Conflicts:
contrib/oldexp/org-exp.el
lisp/org.el
Conflicts:
contrib/oldexp/org-exp.el
lisp/org.el
| contrib/oldexp/org-exp.el | diff1 | diff2 | blobhistory |
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |
| lisp/org-docview.el | diff1 | diff2 | blobhistory |