Merge branch 'master' of git+ssh://repo.or.cz/srv/git/ajatus
commit42b0d861a5e90d715b2647cabaadfc86d149b8c7
authorHenri Bergius <henri.bergius@iki.fi>
Wed, 12 Dec 2007 11:28:24 +0000 (12 13:28 +0200)
committerHenri Bergius <henri.bergius@iki.fi>
Wed, 12 Dec 2007 11:28:24 +0000 (12 13:28 +0200)
tree3340c2b95191d307dcdf4667ca82332efa5585a6
parent415dfbeaf13d6030b59f68a895f7da5fb9acaa91
parentee9adaa8cc2fc2628c31eec8443f6ab773182146
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/ajatus