Merge branch 'master' of ssh://mercury/var/git/irwi
authorJari Jarvi <t7jaja00@students.oamk.fi>
Tue, 13 Jul 2010 09:59:37 +0000 (12:59 +0300)
committerJari Jarvi <t7jaja00@students.oamk.fi>
Tue, 13 Jul 2010 09:59:37 +0000 (12:59 +0300)
commit495c26ae2dd828cd409cf5547ad97d5bd4d12d39
tree9731e2a2d50ec751ab50a2a249b1fbdcc94debe8
parentd9ea85b082b19c47b6827e793373213c908a3dd1
parent521471f333d8487faa161fc3301801ea7d83105a
Merge branch 'master' of ssh://mercury/var/git/irwi