Merge pull request #1117 from sipa/deadlockfix
authorPieter Wuille <pieter.wuille@gmail.com>
Tue, 17 Apr 2012 18:05:02 +0000 (11:05 -0700)
committerPieter Wuille <pieter.wuille@gmail.com>
Tue, 17 Apr 2012 18:05:02 +0000 (11:05 -0700)
Fix potential deadlock

1  2 
src/main.cpp

diff --cc src/main.cpp
Simple merge