Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 22 Jul 2011 19:41:24 +0000 (21:41 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 22 Jul 2011 19:41:24 +0000 (21:41 +0200)
commit7beada58cd24b1e1121d038bbb61436ebc782770
treed3d2a5e14ec326e31ff2a42eccb0fd49e4befd4f
parent8b936b617f2d51f66a86b407a51af55d8fb804fb
parentc2da35319d7d9c2a28a2299d09176a0459cf7e00
Merge branch 'master' of https://github.com/bitcoin/bitcoin
src/main.cpp