Merge branch 'master' of ssh://harriva@mercury.wipsl.com/var/git/irreco
commitd58c078e16e62e714899ab8cdb2a0c5645b16479
authorHarri Vattulainen <t5vaha01@students.oamk.fi>
Tue, 28 Oct 2008 11:49:49 +0000 (28 13:49 +0200)
committerHarri Vattulainen <t5vaha01@students.oamk.fi>
Tue, 28 Oct 2008 11:49:49 +0000 (28 13:49 +0200)
treeb6b8503d3a98e823bf73a30743003fe40d7c71f2
parentc73d11c3a7cf33df78d1de4b54fb5380d3f965a0
parent9279cb2428687c6af3b0bfe619b398905c36f3f2
Merge branch 'master' of ssh://harriva@mercury.wipsl.com/var/git/irreco