Merge branch 'bugfix_gmp_submitblock_rv' into bugfix_gmp_submitblock_rv_2
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 8 Apr 2012 02:11:31 +0000 (22:11 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 8 Apr 2012 02:11:31 +0000 (22:11 -0400)
commit9e66923d3461e88d621c2d8f5e6315d1d1a79235
tree36ebf4df6dcf465f47222c26047cc39a6041498e
parent17b8662fc187a742ac9b194e06f4ef9d0eedda7d
parent74274c04f93181aa264acba985bfabdd9b721e5e
Merge branch 'bugfix_gmp_submitblock_rv' into bugfix_gmp_submitblock_rv_2

Conflicts:
gmp-proxy.py
gmp-proxy.py