Merge branch 'getblock_cleanup' of https://github.com/luke-jr/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Feb 2012 17:41:26 +0000 (12:41 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Feb 2012 17:41:26 +0000 (12:41 -0500)
commitfc4f4c2e9a0f90a2fad9279f755d08b99b27796b
treeec7beaa3674c9bf047aa34c4bcd2bc7103d69bc8
parent35b327a52087033086803f3b361bf435a66a869b
parent34f878891520927206fb81993579cfad8e74a793
Merge branch 'getblock_cleanup' of https://github.com/luke-jr/bitcoin