Merge branch 'bugfix_MRD_CV'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Nov 2012 14:05:07 +0000 (14:05 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 19 Nov 2012 14:05:07 +0000 (14:05 +0000)
commit3082d4a04a1c156fe0b195ba7ceb1d640086bec5
treedce87dce41543ab86cd0acabfa7f087a761f81d0
parent98aaa16b567e865c776c196f684ff0247d38a905
parent58bd419f4fc32af26e2f806fae70d82361aea075
Merge branch 'bugfix_MRD_CV'

Conflicts:
merklemaker.py
merklemaker.py