Merge commit 'e27ae49'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 18 Feb 2013 22:22:37 +0000 (22:22 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 18 Feb 2013 22:22:37 +0000 (22:22 +0000)
commit04c0f29af982b75b5244d61a36e5647cf84e54b4
treee5325fd25bedc5d0e9ffec9922623fe5789afefe
parentb93530a8f32141f16495d7e1a8bed5ab5c2576b4
parente27ae4912cac85f4b7b733b7af231f858983049a
Merge commit 'e27ae49'

Conflicts:
merklemaker.py
merklemaker.py