Merge branch 'http-version' of https://github.com/jgarzik/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Fri, 15 Apr 2011 15:41:39 +0000 (11:41 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Fri, 15 Apr 2011 15:41:39 +0000 (11:41 -0400)
commita381eb8ddbad0a6924b856d0025b79562077edfb
tree1ee5157bac2be75d11325eff0336c42dea275051
parentd7f0287235da6a5c280d5568bf9dbd079a46c28b
parent17616eac17979ce0b3e0426e7d66ec893a2cb6c6
Merge branch 'http-version' of https://github.com/jgarzik/bitcoin