Merge remote branch 'upstream/master'
authorcoblee <chocobo@alum.mit.edu>
Mon, 7 Nov 2011 00:45:58 +0000 (16:45 -0800)
committercoblee <chocobo@alum.mit.edu>
Mon, 7 Nov 2011 00:45:58 +0000 (16:45 -0800)
commitb4587bc111cd34e54666d052dfbcc7251adfb003
treeb1521798d21468f0d7fe4d122fdb29c9d56f2bbe
parent1deaed029fda6163f386c8b34de675f29caba4d1
parent2f6a07618d391cd78a5255ca1302d849ff0959a5
Merge remote branch 'upstream/master'
p2pool/main.py