Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Tue, 29 Jun 2010 12:46:01 +0000 (15:46 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Tue, 29 Jun 2010 12:46:01 +0000 (15:46 +0300)
1  2 
src/remote.cpp

diff --cc src/remote.cpp
Simple merge