tmp
Merge branch 'master' of github.com:forrestv/p2pool
Revert "tmp"

This reverts commit 9a732600870679350b7c2d0fabbd60c0a60acb9c.