Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Tue, 12 Mar 2013 21:31:51 +0000 (22:31 +0100)
committerecdsa <ecdsa@github>
Tue, 12 Mar 2013 21:31:51 +0000 (22:31 +0100)
commit3d3ec2e7b0ef06aef2294c75458592882d8b74e6
treee3d65b06fe4b28e1ae28d27f6901e17d584503cd
parentc5bfd0846ad7c12333450794a9a9cd0b83be6aed
parent4e4a43b59e9e85b75dd9440749a938c0ef8462cc
Merge branch 'master' of git://github.com/spesmilo/electrum