| commit | 7792fb837ae1266d95fe56921acf9387e1b39a50 | |
| author | Carsten Dominik <carsten.dominik@gmail.com> | |
| Mon, 31 Aug 2009 06:53:35 +0000 (31 08:53 +0200) | ||
| committer | Carsten Dominik <carsten.dominik@gmail.com> | |
| Mon, 31 Aug 2009 06:53:35 +0000 (31 08:53 +0200) | ||
| tree | 6250c7b3655caae0785c579f4da01b127d4ecdb2 | treesnapshot (tar.gz zip) |
| parent | 4d7494d58bbe9e94d6b1c7974ad61b65d09692b9 | commitdiff |
| parent | 3bc997fe8f4c8c57deaa451947a733a28500fb8e | commitdiff |
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
Conflicts:
lisp/ChangeLog
Conflicts:
lisp/ChangeLog
| lisp/ChangeLog | diff1 | diff2 | blobhistory |