Merge branch 'bugfix_txn_isCoinbase'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 23 Apr 2012 22:29:54 +0000 (18:29 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 23 Apr 2012 22:29:54 +0000 (18:29 -0400)
commit3624776b37929e6b570034951ccf24f0dd410098
treed17ca518444fd30bb45fa8ef93d2246702ee08c9
parentfc0472c75bc7cc292ca6ec682dda671780500f8d
parent95e575ee55980de815edbb2df85a4d2fa6093167
Merge branch 'bugfix_txn_isCoinbase'

Conflicts:
bitcointxn.py
bitcoin/txn.py