Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Sat, 23 Feb 2013 15:09:13 +0000 (16:09 +0100)
committerThomasV <thomasv@gitorious>
Sat, 23 Feb 2013 15:09:13 +0000 (16:09 +0100)

Trivial merge