Merge branch 'bugfix_notrim'
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 11 May 2012 17:36:24 +0000 (17:36 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 11 May 2012 17:36:24 +0000 (17:36 +0000)
commit7c01b5e9d40336d75cb4c5f587036bdc7b827691
tree159b595d838048fee61a9db256c6624b26425174
parentc867fc64e4751d00d6f007c9a41c42b082007fe2
parentfc96b7e349c30de236d9e59edad23a0421918061
Merge branch 'bugfix_notrim'

Conflicts:
merklemaker.py
merklemaker.py