Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Wed, 31 Aug 2011 15:06:38 +0000 (17:06 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Wed, 31 Aug 2011 15:06:38 +0000 (17:06 +0200)
commitf43f46c175d7e6d7426536f8efcad05d2eafba80
treec0d2aba4ef565613c2b471058b490ac59f2e17bd
parent6c85cbecf1198d1052c9835ff7e23bb2966d9503
parent829e21733b1c232c79c1a2d10598eb47b2f5f7f9
Merge branch 'master' of https://github.com/bitcoin/bitcoin