Merge branch 'master' of github.com:forrestv/p2pool
authorForrest Voight <forrest@forre.st>
Tue, 8 Nov 2011 17:13:02 +0000 (12:13 -0500)
committerForrest Voight <forrest@forre.st>
Tue, 8 Nov 2011 17:13:02 +0000 (12:13 -0500)
commitc0de0c21bad8ffed12a0090b0a370206876ebf50
treea31e53fcc3690e5441e4af920a1e11bef795730a
parent173b2be1b8af001400e6d58f7c27cb610973f9eb
parent9740bb5cc49cda393470ff88f2470424c59f809e
Merge branch 'master' of github.com:forrestv/p2pool
p2pool/main.py