Merge branch 'bugfix_race_coinbase_2' into bugfix_race_coinbase_3
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 8 Mar 2012 15:42:27 +0000 (10:42 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 8 Mar 2012 15:42:27 +0000 (10:42 -0500)
commit5e4ad682dce3b8f073c4be867af0a39f5bcacb40
treea40a7d84aeb54216dae10695597570b2d8178950
parent628b5f6642aefcaaa3d64dac64ea4c78ff5470d5
parentdaad840cbf19f85d97dd1229cc83b16988b44147
Merge branch 'bugfix_race_coinbase_2' into bugfix_race_coinbase_3

Conflicts:
eloipool.py
eloipool.py