Merge branch 'bugfix_CMRWait'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 26 Nov 2012 00:29:37 +0000 (00:29 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 26 Nov 2012 00:29:37 +0000 (00:29 +0000)
commit475de39fd2b9e6f802bc7e66059715586f0d6a33
treecdd312f581ac9645cf07ca19bbca7a458b916d00
parentb126ab0c9c25fd79312c7da5dc3f86f8a1c8b262
parent6b59b47726cdbbc3dbc83cb5fe0206b814a89b2d
Merge branch 'bugfix_CMRWait'

Conflicts:
merklemaker.py
merklemaker.py