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)

Trivial merge