Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Mon, 1 Apr 2013 10:12:29 +0000 (12:12 +0200)
committerecdsa <ecdsa@github>
Mon, 1 Apr 2013 10:12:29 +0000 (12:12 +0200)
commit2b61c8e0cc46cd984bfa7ad9894f32054e0839e5
treee9d39c0d52b5297504b8897cbe47a011e70ad4bc
parent5cc05b06852a0205eea4bc04af6be79913e2c750
parentdd630a8bb7d482cb83cc875f74baa7d6d2855ce1
Merge branch 'master' of git://github.com/spesmilo/electrum