Merge branch 'master' of gitorious.org:electrum/electrum

Conflicts: client/electrum
13 years ago · 350a462901
2 changed files with 2 additions and 2 deletions
--- a/client/electrum
+++ b/client/electrum
@ -305,7 +305,7 @@ if __name__ == '__main__':
            v = line['value'] 
            b += v
            try:
-                time_str = datetime.datetime.fromtimestamp( line['timestamp']) 
+                time_str = str( datetime.datetime.fromtimestamp( line['timestamp']))
            except:
                print line['timestamp']
                time_str = 'pending'
--- a/client/version.py
+++ b/client/version.py
@ -1,2 +1,2 @@
-ELECTRUM_VERSION = "0.43b"
+ELECTRUM_VERSION = "0.43c"
 SEED_VERSION = 4  # bump this everytime the seed generation is modified
`@ -1,2 +1,2 @@`
	`ELECTRUM_VERSION = "0.43b"`	`ELECTRUM_VERSION = "0.43c"`
	`SEED_VERSION = 4 # bump this everytime the seed generation is modified`	`SEED_VERSION = 4 # bump this everytime the seed generation is modified`