URI: 
       tMerge branch 'master' of github.com:spesmilo/electrum - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit 8a8aeb456780c016e876526128be1adf7676db9a
   DIR parent a1a5886e57d7e72ed2163a9835fda4629c2eaf86
  HTML Author: thomasv <thomasv@gitorious>
       Date:   Fri, 22 Feb 2013 14:26:22 +0100
       
       Merge branch 'master' of github.com:spesmilo/electrum
       
       Diffstat:
         M electrum                            |       1 +
       
       1 file changed, 1 insertion(+), 0 deletions(-)
       ---
   DIR diff --git a/electrum b/electrum
       t@@ -566,6 +566,7 @@ if __name__ == '__main__':
        
            if cmd == 'history':
                import datetime
       +        balance = 0
                for item in wallet.get_tx_history():
                    tx_hash, conf, is_mine, value, fee, balance, timestamp = item
                    try: