Merge branch 'master' of git://github.com/hardcpp/p2pool into hardcpp-master2