Merge branch 'master' of github.com:slush0/stratum-mining
authorslush <info@bitcoin.cz>
Tue, 2 Oct 2012 16:53:17 +0000 (16:53 +0000)
committerslush <info@bitcoin.cz>
Tue, 2 Oct 2012 16:53:17 +0000 (16:53 +0000)

Trivial merge