Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Fri, 4 Oct 2013 15:55:01 +0000 (17:55 +0200)
committerThomasV <thomasv@gitorious>
Fri, 4 Oct 2013 15:55:01 +0000 (17:55 +0200)

Trivial merge