Merge branch 'spentpertxout' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 12 Apr 2011 17:31:44 +0000 (13:31 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 12 Apr 2011 17:31:44 +0000 (13:31 -0400)
1  2 
main.cpp

diff --cc main.cpp
Simple merge