Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Tue, 5 Mar 2013 13:28:20 +0000 (14:28 +0100)
committerecdsa <ecdsa@github>
Tue, 5 Mar 2013 13:28:20 +0000 (14:28 +0100)
commit2c9b06ae1cc6918ef8cf01f6e12e3b750062a59c
treed3d5ff3e1ca41e58c1016feb9bc317e2f60a51df
parent554ca6040d793908872f9c321e21b1d6896d4a21
parent54a995c456f5835fb11fb98bf2a347f562460abe
Merge branch 'master' of git://github.com/spesmilo/electrum