Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Tue, 5 Mar 2013 13:28:20 +0000 (14:28 +0100)
committerecdsa <ecdsa@github>
Tue, 5 Mar 2013 13:28:20 +0000 (14:28 +0100)

Trivial merge