Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Tue, 18 Dec 2012 16:18:20 +0000 (17:18 +0100)
committerThomasV <thomasv@gitorious>
Tue, 18 Dec 2012 16:18:20 +0000 (17:18 +0100)

Trivial merge