Merge branch 'getmininginfo' of https://github.com/luke-jr/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Fri, 13 Jan 2012 15:06:05 +0000 (10:06 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Fri, 13 Jan 2012 15:06:05 +0000 (10:06 -0500)
1  2 
src/bitcoinrpc.cpp

Simple merge