Merge branch 'master' of github.com:spesmilo/electrum
authorthomasv <thomasv@gitorious>
Fri, 12 Apr 2013 11:02:07 +0000 (13:02 +0200)
committerthomasv <thomasv@gitorious>
Fri, 12 Apr 2013 11:02:07 +0000 (13:02 +0200)

Trivial merge