Merge branch 'subcent-change' of https://github.com/tcatm/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Sun, 13 Mar 2011 21:15:28 +0000 (17:15 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Sun, 13 Mar 2011 21:15:28 +0000 (17:15 -0400)
1  2 
main.cpp

diff --cc main.cpp
Simple merge