Merge branch 'master' of ssh://mercury/var/git/irwi
authorJari Jarvi <t7jaja00@students.oamk.fi>
Thu, 8 Jul 2010 10:57:24 +0000 (13:57 +0300)
committerJari Jarvi <t7jaja00@students.oamk.fi>
Thu, 8 Jul 2010 10:57:24 +0000 (13:57 +0300)
commitb7ed6b2adabca3f775e65ba14893eef74f042560
treea35bc8545d4fb70f1fada4572b7f5cbf4b731308
parent621f09956bc837b5a5135ebb99fe9e1391bf3163
parent9135c7bbd16f58015b66e825a552a1ace1dc93a4
Merge branch 'master' of ssh://mercury/var/git/irwi

Conflicts:
src/selectremotedlg.cpp
src/selectremotedlg.cpp