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)

Trivial merge