Merge branch 'reorginfo' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 16:03:19 +0000 (11:03 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 16:03:19 +0000 (11:03 -0500)
commit8c7358e1ddc16048c3f2f3cd58caf8c1d7798ba4
tree696f4ced464a63e50c9aba0767796a1102fcf58c
parente1bad25feec4ac7d26beb39cc61b62c2a0129cc2
parentceaa13eff2486b5b311ead97223213c41d473092
Merge branch 'reorginfo' of https://github.com/sipa/bitcoin
src/main.cpp