Merge branch 'showdefaultsinhelp' of https://github.com/dooglus/bitcoin into integration
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 20 Jan 2011 21:20:11 +0000 (16:20 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 20 Jan 2011 21:20:11 +0000 (16:20 -0500)
1  2 
init.cpp

diff --cc init.cpp
Simple merge