Merge branch 'master' of github.com:spesmilo/electrum
authorslush <info@bitcoin.cz>
Sun, 9 Dec 2012 23:51:07 +0000 (00:51 +0100)
committerslush <info@bitcoin.cz>
Sun, 9 Dec 2012 23:51:07 +0000 (00:51 +0100)

Trivial merge