Merge commit 'refs/merge-requests/6' of git://gitorious.org/electrum/electrum into...
authorThomasV <thomasv@gitorious>
Thu, 1 Dec 2011 16:41:56 +0000 (19:41 +0300)
committerThomasV <thomasv@gitorious>
Thu, 1 Dec 2011 16:41:56 +0000 (19:41 +0300)
commitfbec8794e64183e748aa42f2812bb6f237f60cdf
tree6bc6196143cb1507d0af0f00e33a1257b055b709
parent9adc0b14f7ea3cbb46c506a95b7af7f2f6ab3e14
parentfdeb0fddcbe2cfafb80febeac1e4c3f35ceb6ee3
Merge commit 'refs/merge-requests/6' of git://gitorious.org/electrum/electrum into merge-requests/6
server.py