Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 19 Dec 2011 20:14:22 +0000 (15:14 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 19 Dec 2011 20:14:22 +0000 (15:14 -0500)
1  2 
src/bitcoinrpc.cpp

Simple merge