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

commit 3b5d0cc9748b6cb14baf312e1d9f43488e6a4bdd
parent bc0036297b906bc53ce3886ea146c752e47e1ce9
Author: ThomasV <thomasv@electrum.org>
Date:   Thu, 28 Jun 2018 19:56:32 +0200

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

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