Merge branch 'master' of github.com:spesmilo/electrum
authorslush <info@bitcoin.cz>
Mon, 1 Apr 2013 02:24:26 +0000 (04:24 +0200)
committerslush <info@bitcoin.cz>
Mon, 1 Apr 2013 02:24:26 +0000 (04:24 +0200)

Trivial merge