Merge branch 'master' of github.com:spesmilo/electrum
authorthomasv <thomasv@gitorious>
Fri, 22 Feb 2013 12:40:52 +0000 (13:40 +0100)
committerthomasv <thomasv@gitorious>
Fri, 22 Feb 2013 12:40:52 +0000 (13:40 +0100)

Trivial merge