Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Tue, 27 Nov 2012 22:32:59 +0000 (23:32 +0100)
committerThomasV <thomasv@gitorious>
Tue, 27 Nov 2012 22:32:59 +0000 (23:32 +0100)
commit7601ce56e1ea4b9b8d8d234b9dfa1ae5afdcee6d
tree7a86d1c27f62b44c3fb30c0e2a3fc876899c99fb
parentc68bf5a1d7409d9b822fd4bc488a2e071e32dd43
parent201a13131f495c0e105f35ab7da85f18aadffe84
Merge branch 'master' of git://github.com/spesmilo/electrum