Merge branch 'dyntarget'
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 13 Sep 2012 09:03:36 +0000 (09:03 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 13 Sep 2012 09:03:36 +0000 (09:03 +0000)
commitf451f55d0132ffa1029ee6c6b4ded446ba4d81b4
tree99077e711d243fcf45f4391816223f86b075000e
parent7d76818f02752279c4bb50c4a728235404626662
parente4511f683d5640ead4732f9a5cf5b7b7fec16770
Merge branch 'dyntarget'

Conflicts:
eloipool.py
eloipool.py
jsonrpc_getblocktemplate.py
merklemaker.py