Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Sat, 6 Aug 2011 16:45:15 +0000 (18:45 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Sat, 6 Aug 2011 16:45:15 +0000 (18:45 +0200)
commit330c190958a31a126de7a7b12124070300b1567b
treef5a43d970c66709ea15ed44b0b5a7e63f880c82c
parente74e8a184a70287e1f438e81a7b8ffc2bf09c46d
parentbd1e54bc0b7f1bdfc571edf1f4f1ecf422260b8c
Merge branch 'master' of https://github.com/bitcoin/bitcoin
src/bitcoinrpc.cpp
src/init.cpp
src/util.h