Merge branch show-version-in-help-2 of https://github.com/dooglus/bitcoin
authorChris Moore <dooglus@gmail.com>
Fri, 21 Jan 2011 20:14:20 +0000 (12:14 -0800)
committerChris Moore <dooglus@gmail.com>
Fri, 21 Jan 2011 20:14:20 +0000 (12:14 -0800)
1  2 
init.cpp

diff --cc init.cpp
Simple merge