Merge branch 'bugfix_race_edge'
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 27 Nov 2012 23:01:07 +0000 (23:01 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 27 Nov 2012 23:01:07 +0000 (23:01 +0000)
commitfe75c6fbbc3e60594c6060368514892b6b83d65e
treeca5dc7fbbd99dea3592d1466104d5be57f4d7735
parent17d8213c580500ce464bf4a3cb03e3901d046cd0
parentc64c73f9c8db5f6946a23b17defb5581e0ae1637
Merge branch 'bugfix_race_edge'

Conflicts:
merklemaker.py
merklemaker.py