Merge branch 'master' of git://github.com/spesmilo/electrum
authorthomasv <thomasv@gitorious>
Mon, 7 Oct 2013 17:24:26 +0000 (19:24 +0200)
committerthomasv <thomasv@gitorious>
Mon, 7 Oct 2013 17:24:26 +0000 (19:24 +0200)

Trivial merge