Merge branch 'master' of git://github.com/spesmilo/electrum
authorslush0 <info@bitcoin.cz>
Fri, 18 Jan 2013 13:10:02 +0000 (13:10 +0000)
committerslush0 <info@bitcoin.cz>
Fri, 18 Jan 2013 13:10:02 +0000 (13:10 +0000)
commit3f919e193b15a6096d120828fd742188b6578497
treef871bebedb9189087d9719955f209784845c4a64
parent2959a29134f87298a64a66536e7b4bb4601774b3
parentc55efea14eca52b600644df16f5f26ec01abf1ba
Merge branch 'master' of git://github.com/spesmilo/electrum