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

commit 9a4d44780be150704e7baefd5577657f52a2a7e6
parent 1b2a319f1848a3acfdf2f1899e7dfae6e2a86b64
Author: Maran <maran.hidskes@gmail.com>
Date:   Mon, 18 Feb 2013 23:45:06 +0100

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

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