Merge branch 'master' into coinbase_height
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 31 Aug 2012 02:16:23 +0000 (02:16 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 31 Aug 2012 03:02:33 +0000 (03:02 +0000)
commit258284d2655c0843d1ca98630a147445dc94b9d4
tree7d7fe16a5752a87f10a841e343454f1ea4d59da1
parentd13b47e4474d93d06fc11070d96bdc34cb5ec15b
parentbcc0839793a30e8c1ebcd870d5273000db8a5b88
Merge branch 'master' into coinbase_height

Conflicts:
merklemaker.py
bitcoin/txn.py
config.py.example
eloipool.py
merklemaker.py