Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Tue, 12 Mar 2013 20:56:10 +0000 (21:56 +0100)
committerecdsa <ecdsa@github>
Tue, 12 Mar 2013 20:56:10 +0000 (21:56 +0100)

Trivial merge