Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Sun, 17 Mar 2013 18:09:06 +0000 (19:09 +0100)
committerecdsa <ecdsa@github>
Sun, 17 Mar 2013 18:09:06 +0000 (19:09 +0100)

Trivial merge