Merge branch 'master' of git+ssh://w_i@repo.or.cz/srv/git/ajatus
commite95f0d9ca9dfb959dc0c95cd190989faf08583e1
authorJerry Jalava <jerry.jalava@gmail.com>
Thu, 20 Dec 2007 11:34:38 +0000 (20 13:34 +0200)
committerJerry Jalava <jerry.jalava@gmail.com>
Thu, 20 Dec 2007 11:34:38 +0000 (20 13:34 +0200)
treed4ad81fc3ba8fadaee376bed8766ccfe77f8748e
parent6f7b971eb14478460320941a3c3d3d3195908b28
parent15d00a67ccc452f49130ac97473e02e34fb3cd39
Merge branch 'master' of git+ssh://w_i@repo.or.cz/srv/git/ajatus