Merge commit 'refs/merge-requests/4' of git://gitorious.org/electrum/electrum into...
authorThomasV <thomasv@gitorious>
Tue, 29 Nov 2011 09:48:07 +0000 (10:48 +0100)
committerThomasV <thomasv@gitorious>
Tue, 29 Nov 2011 09:48:07 +0000 (10:48 +0100)
commit829c812f8e21c2dbda6098246d2c2b037fcacfc1
tree32a8bbb86234365d39c6372a4644df835a91aca5
parent4dad1701d1d162377a73201150fea1129452311f
parent5582956c37239131ffa276b58813fe225f413a36
Merge commit 'refs/merge-requests/4' of git://gitorious.org/electrum/electrum into merge-requests/4
client/electrum.py