Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Sun, 16 Mar 2014 19:24:10 +0000 (20:24 +0100)
committerThomasV <thomasv@gitorious>
Sun, 16 Mar 2014 19:24:10 +0000 (20:24 +0100)

Trivial merge