Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Mon, 16 Apr 2012 14:38:27 +0000 (18:38 +0400)
committerThomasV <thomasv@gitorious>
Mon, 16 Apr 2012 14:38:27 +0000 (18:38 +0400)
commite42cd36318c5924409adf4189bab5c06662705c7
treeb2ed5a65e41eff15f3d825c8d8a28218aac4235e
parente4cefa8bc5d30b5df12e1cf851380ccad0145a87
parent4edb11c181e3647ea6e7eda6330f30392fe61b3b
Merge branch 'master' of gitorious.org:electrum/electrum