Merge branch 'bugfix_hicb' into coinbase_height
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 31 Aug 2012 07:00:12 +0000 (07:00 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 31 Aug 2012 07:00:12 +0000 (07:00 +0000)
commitc977fc4783ca678ec3fc60a464dbb4804db3f693
tree2b43310d78779da1264780ff4308860be9964c01
parent5f916b4ba044a2f5694dc2037f615089261870cc
parentf2329f200e6007b0429873a190f9dc7de56aab0d
Merge branch 'bugfix_hicb' into coinbase_height