Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 29 Jul 2011 12:45:54 +0000 (14:45 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 29 Jul 2011 12:45:54 +0000 (14:45 +0200)
commit53d65b5500bf56f600b98bb7435d24c8ab76d12e
tree1f82f0eec0c61e594a3aaa1648b037df2e4adc86
parentee014e5b10f5f65820ff056311051ff49813b294
parente1f13129e89f46df631f9523eea4c0e0448c9b7b
Merge branch 'master' of https://github.com/bitcoin/bitcoin