Merge branch 'coinbase_height'
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 1 Sep 2012 02:36:56 +0000 (02:36 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 1 Sep 2012 02:36:56 +0000 (02:36 +0000)
commit7d75920229bb41139187bae673b48b3e29419810
tree68236878072b55ee6ce12c7dec8cf052f781b1e4
parentbcc0839793a30e8c1ebcd870d5273000db8a5b88
parente7294042b230ef232b038b7080e7d679765d56e8
Merge branch 'coinbase_height'