Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Sun, 4 Dec 2011 12:16:11 +0000 (13:16 +0100)
committerThomasV <thomasv@gitorious>
Sun, 4 Dec 2011 12:16:11 +0000 (13:16 +0100)

Trivial merge