Merge branch 'master' of ssh://jonik@mercury.wipsl.com/var/git/irreco
commited503a9f19c6e4c531f908cc8e969039b7878d6f
authorJoni Kokko <t5kojo01@students.oamk.fi>
Tue, 11 Nov 2008 11:42:14 +0000 (11 13:42 +0200)
committerJoni Kokko <t5kojo01@students.oamk.fi>
Tue, 11 Nov 2008 11:42:14 +0000 (11 13:42 +0200)
treebd5920961c57f3f8fac3e6de863ba8d0fdeadd14
parent45ccf4edae3662aefea710974b1d4634e41afa7f
parent0624c0c7234622a6aca3b9a7b7f88098c62c06ca
Merge branch 'master' of ssh://jonik@mercury.wipsl.com/var/git/irreco