Merge branch 'master' of git+ssh://repo.or.cz/srv/git/ajatus
commit833a4aa9db00627d1f009180167980fe8ea9a199
authorHenri Bergius <henri.bergius@iki.fi>
Fri, 14 Dec 2007 08:28:15 +0000 (14 10:28 +0200)
committerHenri Bergius <henri.bergius@iki.fi>
Fri, 14 Dec 2007 08:28:15 +0000 (14 10:28 +0200)
tree5c565d07e6404ebe83fb1598fc6dfa4b1e414550
parent42b0d861a5e90d715b2647cabaadfc86d149b8c7
parent661fb8193e6f4e10f867c8f3c58640d9931b59c1
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/ajatus