Merge commit 'refs/merge-requests/2' of git://gitorious.org/electrum/electrum into...
authorThomasV <thomasv@gitorious>
Sat, 26 Nov 2011 15:08:46 +0000 (18:08 +0300)
committerThomasV <thomasv@gitorious>
Sat, 26 Nov 2011 15:08:46 +0000 (18:08 +0300)
1  2 
server.py

diff --cc server.py
Simple merge