Merge branch 'master' into optional_donation
authorForrest Voight <forrest.voight@gmail.com>
Sat, 26 Nov 2011 18:42:35 +0000 (13:42 -0500)
committerForrest Voight <forrest.voight@gmail.com>
Sat, 26 Nov 2011 18:42:35 +0000 (13:42 -0500)
commita693ad3eca68cfede4a20437ddcd1adbce413527
tree537337ead720b20a7e1c9f5ad268eabfb2762f5f
parent83f640ccc181d56be9aa7c09f92cc4165d8e7c54
parent38a4495d64a38401734e499b3f57758d5767c7bb
Merge branch 'master' into optional_donation
p2pool/bitcoin/data.py
p2pool/data.py
p2pool/main.py