URI: 
       tfix for merchant script - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit b39f1424ec434ba0977e71db4e22dbc59dd0216c
   DIR parent 0e851a5f62f631cc9b58a19798c8230f4b68f3f5
  HTML Author: ThomasV <thomasv@gitorious>
       Date:   Fri, 16 Nov 2012 07:47:00 +0100
       
       fix for merchant script
       
       Diffstat:
         M scripts/merchant.py                 |       2 +-
       
       1 file changed, 1 insertion(+), 1 deletion(-)
       ---
   DIR diff --git a/scripts/merchant.py b/scripts/merchant.py
       t@@ -114,7 +114,7 @@ def process_request(i, amount, confirmations, expires_in, password):
                print "wrong password ", password
                return 
            addr = wallet.get_new_address(i, 0)
       -    out_queue.put( ('request',(i,addr,amount,expires_in) ))
       +    out_queue.put( ('request', (i, addr, amount, confirmations, expires_in) ))
            return addr
        
        def get_mpk():