Merge branch 'master' of github.com:slush0/stratum-mining
authorslush <info@bitcoin.cz>
Tue, 4 Sep 2012 14:21:41 +0000 (16:21 +0200)
committerslush <info@bitcoin.cz>
Tue, 4 Sep 2012 14:21:41 +0000 (16:21 +0200)

Trivial merge