Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Sun, 10 Mar 2013 15:26:36 +0000 (16:26 +0100)
committerecdsa <ecdsa@github>
Sun, 10 Mar 2013 15:26:36 +0000 (16:26 +0100)

Trivial merge