Merge branch 'postfeb20' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 16:06:44 +0000 (11:06 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 16:06:44 +0000 (11:06 -0500)
1  2 
src/main.cpp
src/net.h

diff --cc src/main.cpp
Simple merge
diff --cc src/net.h
Simple merge