Merge commit '90fcc2f' into unstable
authorForrest Voight <forrest@forre.st>
Mon, 15 Aug 2011 08:42:45 +0000 (04:42 -0400)
committerForrest Voight <forrest@forre.st>
Mon, 15 Aug 2011 08:42:45 +0000 (04:42 -0400)
commitee05b58eee1dad4148754b3c823a58c37fe24d03
tree02232ad4536c94abfc2f773555d27bef9ea20b44
parente4926c043d9df9a9883f5b7900622207b421c1a3
parent90fcc2f6bc7812c9c5996fad16d1d528d4ca370f
Merge commit '90fcc2f' into unstable

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