Merge branch 'bugfix_race_coinbase' into bugfix_race_coinbase_2
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 8 Mar 2012 15:41:26 +0000 (10:41 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 8 Mar 2012 15:41:26 +0000 (10:41 -0500)
commitdaad840cbf19f85d97dd1229cc83b16988b44147
tree3c7752af3b0f3963860390431cd9ce30297113ef
parentdc2c64ba6968b130259649b1cd05b9cf7163ad5c
parentcf7c1c23e9a9681b15e50e6caa8e553b9fefaf0d
Merge branch 'bugfix_race_coinbase' into bugfix_race_coinbase_2

Conflicts:
eloipool.py
eloipool.py