Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Thu, 17 Nov 2011 00:56:28 +0000 (03:56 +0300)
committerThomasV <thomasv@gitorious>
Thu, 17 Nov 2011 00:56:28 +0000 (03:56 +0300)
1  2 
client/electrum.py

Simple merge