Merge branch 'master' of https://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Tue, 9 Oct 2012 15:15:05 +0000 (17:15 +0200)
committerMaran <maran.hidskes@gmail.com>
Tue, 9 Oct 2012 15:15:05 +0000 (17:15 +0200)
commit3ce5eef076ce1f28d4f57e7e3dcb74c2582a15e5
treee242f9d0cc7a1a6bab05010d0ae2fb0bd6549571
parent8833555b35b49fe3b62539692e0b6c8950c0e31f
parent93ac0e806b3b657b1354c1fe9b1e30eb9858eba5
Merge branch 'master' of https://github.com/spesmilo/electrum
lib/interface.py