Merge branch 'remove_low_bandwidth' into cruftless
authorForrest Voight <forrest@forre.st>
Sat, 3 Dec 2011 23:34:35 +0000 (18:34 -0500)
committerForrest Voight <forrest@forre.st>
Sat, 3 Dec 2011 23:34:35 +0000 (18:34 -0500)
commit4c1b50e0587d384d04f0f5892da8e82297593895
treee5b789fb1884e7ddde1f557cf659b5b07afd78b7
parent75cfba5e14a07cf69c0f225ad074ce455b75a299
parent8e2e02b13d48cacded95bc6146e765ed10386c5d
Merge branch 'remove_low_bandwidth' into cruftless

Conflicts:
p2pool/main.py
p2pool/p2p.py
p2pool/main.py
p2pool/p2p.py