Merge branch 'master' of git+ssh://w_i@repo.or.cz/srv/git/ajatus
commitb79ee4e7e6b5da25b71ec7495fc232cfdf394ba9
authorJerry Jalava <jerry.jalava@gmail.com>
Fri, 18 Jan 2008 12:16:20 +0000 (18 14:16 +0200)
committerJerry Jalava <jerry.jalava@gmail.com>
Fri, 18 Jan 2008 12:16:20 +0000 (18 14:16 +0200)
tree10f0f0809bc49452234d29b0a7e0a4026e523929
parent51513d82e5d4e8a452c40e1f0edee9a1cccb95c3
parent1ccb6ffa78a640e66965a52901fd4e2495f7d076
Merge branch 'master' of git+ssh://w_i@repo.or.cz/srv/git/ajatus