Merge branch 'master' of git://github.com/hardcpp/p2pool into hardcpp-master2
authorForrest Voight <forrest@forre.st>
Thu, 25 Apr 2013 04:24:29 +0000 (00:24 -0400)
committerForrest Voight <forrest@forre.st>
Thu, 25 Apr 2013 04:24:29 +0000 (00:24 -0400)
commita32b6efd20124352d7a74047f0d95283b8e5c09c
tree9f13c0b25574cb4048d3c3d7a6a0699e9db66020
parent538af733d1594b9958d0d51724dadba1cc2a894e
parent0d785d3b0135e4cfc943c790f9ec240c318b5b17
Merge branch 'master' of git://github.com/hardcpp/p2pool into hardcpp-master2

Conflicts:
README.md
README.md