Merge branch 'master' of ssh://mercury.wipsl.com/var/git/irwi
authorJari Jarvi <t7jaja00@students.oamk.fi>
Fri, 18 Jun 2010 08:58:21 +0000 (11:58 +0300)
committerJari Jarvi <t7jaja00@students.oamk.fi>
Fri, 18 Jun 2010 08:58:21 +0000 (11:58 +0300)
commit66155b3e3612301cbd37a42e1197e3ba41157fad
tree2db39bde9414027e240bfb0bd82d6550b44f9b70
parentd9e905fe0a9ad37dcadb5d23529a377f47755e3a
parent0b3f66eaac1455402ebce1a04f7f74254c801ab5
Merge branch 'master' of ssh://mercury.wipsl.com/var/git/irwi

Conflicts:
src/remote.cpp
src/remote.cpp