Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Thu, 17 Apr 2014 15:05:45 +0000 (17:05 +0200)
committerThomasV <thomasv@gitorious>
Thu, 17 Apr 2014 15:05:45 +0000 (17:05 +0200)

Trivial merge