Merge branch 'ambig_t'
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 23 Feb 2012 18:26:27 +0000 (13:26 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 23 Feb 2012 18:26:27 +0000 (13:26 -0500)
commit49c79598b75c1de7ac7e18a1a164811e7679c4c6
tree719d029c96fdb3e8286c2d9b7c9b2690dfeae86b
parent212c71f79c384235f3fac81d849dd631b91f8240
parent4a4179e48d6f4bd53806b18ed0e36224b060c82e
Merge branch 'ambig_t'

Conflicts:
eloipool.py
eloipool.py
merklemaker.py