Merge branch 'bugfix_submitblock_rv' into bugfix_submitblock_rv_2
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 8 Apr 2012 02:01:55 +0000 (22:01 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 8 Apr 2012 02:01:55 +0000 (22:01 -0400)
commit1641bd1f3a85a5e31d29a4f98933553390bdd228
treec5fb01c329cf8069705820cda1b849e6fbf56e3b
parent112857b62e47a47bfdc45a9ab03962a6f29f77fb
parentce022561a7a9d288476fa5fe9feb28f885e9c573
Merge branch 'bugfix_submitblock_rv' into bugfix_submitblock_rv_2

Conflicts:
jsonrpcserver.py
jsonrpc_getmemorypool.py