Merge branch 'master' of git+ssh://w_i@repo.or.cz/srv/git/ajatus
commiteeb3a3eedd3c86d17923e7281f58f65f0cff2706
authorJerry Jalava <jerry.jalava@gmail.com>
Wed, 2 Jan 2008 23:26:26 +0000 (3 01:26 +0200)
committerJerry Jalava <jerry.jalava@gmail.com>
Wed, 2 Jan 2008 23:26:26 +0000 (3 01:26 +0200)
tree25dbe2e907e38387412407e141a86079a1967147
parentd6aa5112d96d9b6c3a2b22c45b580a0556d15e11
parentb6a5e33f8fe681b54a3351f4dbbe369ccc2567e2
Merge branch 'master' of git+ssh://w_i@repo.or.cz/srv/git/ajatus