Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Sat, 20 Apr 2013 16:21:56 +0000 (18:21 +0200)
committerecdsa <ecdsa@github>
Sat, 20 Apr 2013 16:21:56 +0000 (18:21 +0200)

Trivial merge