Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Wed, 25 Jun 2014 14:46:05 +0000 (16:46 +0200)
committerThomasV <thomasv@gitorious>
Wed, 25 Jun 2014 14:46:05 +0000 (16:46 +0200)

Trivial merge