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)
commitf290a649f91dca1f8e4fe01e09f20eea2e52cbd8
treeeb3d8a0bcca77741b97016690c14c04f5b1b315b
parenta1de57a063af397612bb77f87c803c578d04f8e5
parent340f0876eabcabefa77588585f7c8f29954dcb48
Merge branch 'getmininginfo' of https://github.com/luke-jr/bitcoin
src/bitcoinrpc.cpp