Merge branch 'bugfix_CMRWait'
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 25 Nov 2012 02:07:48 +0000 (02:07 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 25 Nov 2012 02:07:48 +0000 (02:07 +0000)
commitb126ab0c9c25fd79312c7da5dc3f86f8a1c8b262
tree7d31b144bb986a3f97ee80b54457f7284536f6dc
parent5f341fd1ff7eb38a654cebcf9a5499e6abae24d3
parent8013984620769d36943c57c345896b3d7fff66df
Merge branch 'bugfix_CMRWait'

Conflicts:
merklemaker.py
merklemaker.py