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

2013-09-02 11:16:35 +02:00
parent cde1d0f6c0 fe538cc310
commit 9d1c31255c
15 changed files with 736 additions and 638 deletions
--- a/lib/interface.py
+++ b/lib/interface.py
@@ -396,7 +396,7 @@ class Interface(threading.Thread):
            self.unanswered_requests[self.message_id] = method, params, channel
            ids.append(self.message_id)
            # uncomment to debug
-            # print "-->",request
+            # print "-->", request
            self.message_id += 1
            out += request + '\n'
        while out: