Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Mon, 4 Nov 2013 11:43:02 +0000 (12:43 +0100)
committerThomasV <thomasv@gitorious>
Mon, 4 Nov 2013 11:43:02 +0000 (12:43 +0100)

Trivial merge