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

lib/commands.py

@@ -166,7 +166,7 @@ class Commands:
     def listunspent(self):
         """List unspent outputs. Returns the list of unspent transaction
         outputs in your wallet."""
-        l = copy.deepcopy(self.wallet.get_spendable_coins(exclude_frozen = False))
+        l = copy.deepcopy(self.wallet.get_utxos(exclude_frozen=False))
         for i in l:
             v = i["value"]
             i["value"] = float(v)/COIN if v is not None else None