Merge git://github.com/p2k/bitcoin-qt
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 3 Nov 2011 15:06:57 +0000 (11:06 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 3 Nov 2011 15:06:57 +0000 (11:06 -0400)
1  2 
src/qt/bitcoin.cpp

Simple merge