Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Sat, 16 Mar 2013 20:22:15 +0000 (21:22 +0100)
committerecdsa <ecdsa@github>
Sat, 16 Mar 2013 20:22:15 +0000 (21:22 +0100)

Trivial merge