Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Sat, 24 May 2014 20:06:48 +0000 (22:06 +0200)
committerThomasV <thomasv@gitorious>
Sat, 24 May 2014 20:06:48 +0000 (22:06 +0200)

Trivial merge