Merge branch 'master' of git://github.com/spesmilo/electrum - electrum

commit 2c9b06ae1cc6918ef8cf01f6e12e3b750062a59c
parent 554ca6040d793908872f9c321e21b1d6896d4a21
Author: ecdsa <ecdsa@github>
Date:   Tue,  5 Mar 2013 14:28:20 +0100

Merge branch 'master' of git://github.com/spesmilo/electrum

	electrum Electrum Bitcoin wallet
	git clone https://git.parazyd.org/electrum
	Log \| Files \| Refs \| Submodules