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)
commitb86482dd26a79491bd562693c78c6b9950f2ccba
treec0dbb65edcd6c517a32d1990e8df64773b0b8892
parent1886a12dced7a79a605951f992d3aea4569af575
parent40b0ae0edd60b5df66a5619b2f8b1023f108f843
Merge commit 'refs/merge-requests/2' of git://gitorious.org/electrum/electrum into merge-requests/2
server.py