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

commit ecf6ae65eefc17ae9893d111a9f865f427a9cb42
parent 5416a4ea8a9d3768a4ad3bc18f6c1396c39e86f1
Author: ThomasV <thomasv@electrum.org>
Date:   Sun, 17 Sep 2017 16:58:07 +0200

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

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