Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Thu, 17 Apr 2014 15:05:45 +0000 (17:05 +0200)
committerThomasV <thomasv@gitorious>
Thu, 17 Apr 2014 15:05:45 +0000 (17:05 +0200)
commit3e1a87397d3bdf056d0b45744673e2cfd083c02c
tree2bbc64ac470810b1fb61c5e89c740d5421e33a43
parent8a7a6f347beff3a66af845a54e74a670f1f573c0
parentdeb14f6fe82d01c06449c788ae44d48938478e3d
Merge branch 'master' of git://github.com/spesmilo/electrum