Merge branch 'bugfix_txn_isCoinbase'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 23 Apr 2012 16:33:09 +0000 (12:33 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 23 Apr 2012 16:33:09 +0000 (12:33 -0400)
commit9dbd4f6d9a3339c48c386d579530549164d3161d
tree4d2e1708dc2ade658b135ef58a4e0d2a0bbdeb40
parentdacf3a0486e995a63753c5e19cbfcd1c70f9f702
parent92e24808c05c45ac9f73cc25c2749c01b3fd306e
Merge branch 'bugfix_txn_isCoinbase'

Conflicts:
bitcointxn.py
bitcoin/txn.py