Merge branch 'bugfix_areinpstd' of https://github.com/luke-jr/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 23 Jan 2012 18:09:34 +0000 (13:09 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 23 Jan 2012 18:09:34 +0000 (13:09 -0500)
commitb8056dc5d0b10ca31998ef9bd6b4702f47374ae2
tree3adc06609fa6743e184d9305f1094e3e530fdf72
parent149f580c82922a3b79e4e7fd6ed85adcc0522d91
parent575bdcde931c100288843a8f3540426490a78a60
Merge branch 'bugfix_areinpstd' of https://github.com/luke-jr/bitcoin
src/main.cpp