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

README.rst

@@ -37,11 +37,6 @@ If you don't have pip, install with::
 
 
 
-To start Electrum from your web browser, see
-http://electrum.org/bitcoin_URIs.html
-
-
-
 2. HOW OFFICIAL PACKAGES ARE CREATED
 ------------------------------------
 

plugins/trezor/plugin.py

@@ -141,11 +141,6 @@ class TrezorCompatiblePlugin(HW_PluginBase):
 
         return client
 
-    @hook
-    def close_wallet(self, wallet):
-        if isinstance(wallet, self.wallet_class):
-            self.device_manager().unpair_wallet(wallet)
-
     def initialize_device(self, wallet):
         # Initialization method
         msg = _("Choose how you want to initialize your %s.\n\n"