| commit | 2ccd6d98875c8d8d64ed00a8385f01bf883e8a50 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sun, 30 Jun 2013 22:36:17 +0000 (1 00:36 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sun, 30 Jun 2013 22:36:17 +0000 (1 00:36 +0200) | ||
| tree | aedaf599a1a0d58c8a8d87726aa3c89e9d8f30db | treesnapshot (tar.gz zip) |
| parent | 648c1f8712170cf81485a49d4704b41c1622677b | commitdiff |
| parent | e3195550fc0e057124bbb9e35eb8adb96a6b0d48 | commitdiff |
Merge branch 'maint'
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |
| lisp/ox-html.el | diff1 | diff2 | blobhistory |