Merge branch 'issue34' of https://github.com/dooglus/bitcoin into FIXES
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 20 Jan 2011 19:18:51 +0000 (14:18 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 20 Jan 2011 19:18:51 +0000 (14:18 -0500)
1  2 
init.cpp

diff --cc init.cpp
Simple merge