Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 16 Sep 2011 04:55:47 +0000 (06:55 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 16 Sep 2011 04:55:47 +0000 (06:55 +0200)
commit5dd7318db75db580d602c72a2322df97d8712233
treee15a3c55d610d8c9e26ac2224d746e8b36a0450a
parentc1e667222ad7eac6403cd60aab4d5d09ed0ff02d
parent217208a36d210e7d51e405d0e531ac2b75a3a087
Merge branch 'master' of https://github.com/bitcoin/bitcoin
src/bitcoinrpc.cpp
src/main.cpp
src/main.h