Merge branch 'bugfix_gmp_submitblock_rv_2'
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 12 Apr 2012 01:22:57 +0000 (21:22 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 12 Apr 2012 01:22:57 +0000 (21:22 -0400)
commitc6493410d1ae1138bfd0b19b8cb0b0d9aeb2b6ec
tree6ba270db25a5f9801708069d37215d3a9872158d
parent0c2384192e774a65c1734a8b381fc47137940c42
parent90e4a2454e5043c7cefd77dd082c105dc1d25444
Merge branch 'bugfix_gmp_submitblock_rv_2'

Conflicts:
jsonrpcserver.py
httpserver.py
jsonrpcserver.py