Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Mon, 31 Mar 2014 15:18:26 +0000 (17:18 +0200)
committerThomasV <thomasv@gitorious>
Mon, 31 Mar 2014 15:18:26 +0000 (17:18 +0200)

Trivial merge