Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Mon, 18 Feb 2013 20:12:54 +0000 (21:12 +0100)
committerThomasV <thomasv@gitorious>
Mon, 18 Feb 2013 20:12:54 +0000 (21:12 +0100)

Trivial merge