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

lib/transaction.py

@@ -376,6 +376,7 @@ class Transaction:
         self.inputs = self.d['inputs']
         self.outputs = self.d['outputs']
         self.outputs = map(lambda x: (x['address'],x['value']), self.outputs)
+        self.locktime = self.d['lockTime']
         self.is_complete = is_complete
         
     def __str__(self):

lib/wallet.py

@@ -1847,7 +1847,7 @@ class Wallet(object):
             is_hex = False
          
         if is_hex or (uses_electrum_words and len(words) != 13):
-            print "old style wallet", len(words), words
+            #print "old style wallet", len(words), words
             w = OldWallet(storage)
             w.init_seed(seed) #hex
         else: