Merge branch 'tx_preforwarding' 8.0
authorForrest Voight <forrest@forre.st>
Thu, 18 Oct 2012 00:43:26 +0000 (20:43 -0400)
committerForrest Voight <forrest@forre.st>
Thu, 18 Oct 2012 00:43:26 +0000 (20:43 -0400)
commit94daecfc590dd691a482469a313932809d338738
treefc24c25e57df790960989b607a7258d95b96c00b
parenta2c788b697007184281de68d08dffe3bb23b1bf2
parentb198ed69b91d8dd24c16e41baa7186e2d7f10f59
Merge branch 'tx_preforwarding'
p2pool/main.py
p2pool/web.py