Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Mon, 1 Apr 2013 10:12:29 +0000 (12:12 +0200)
committerecdsa <ecdsa@github>
Mon, 1 Apr 2013 10:12:29 +0000 (12:12 +0200)

Trivial merge