Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Sun, 6 Jan 2013 14:11:35 +0000 (15:11 +0100)
committerThomasV <thomasv@gitorious>
Sun, 6 Jan 2013 14:11:35 +0000 (15:11 +0100)
commite08238a416774c73fff28849e447eb4385034c33
tree51d731a6f38982f55941a1aaf6fc16739fa32e31
parent4345f637ee9c84d5a931b4e3591d61b2d17de361
parent08ec5c442a27af1ca1ddee88b908ebdd4cb84bd9
Merge branch 'master' of git://github.com/spesmilo/electrum