Merge branch 'bugfix_varlen_bytes'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 23 Apr 2012 21:59:04 +0000 (17:59 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 23 Apr 2012 21:59:04 +0000 (17:59 -0400)
commitfc0472c75bc7cc292ca6ec682dda671780500f8d
treee8201c24aed8e4ea6b717e7eb098986ee4aa472a
parent9dbd4f6d9a3339c48c386d579530549164d3161d
parent07bccf8c5a154a03a4d827944c32416c35e93116
Merge branch 'bugfix_varlen_bytes'

Conflicts:
bitcoinvarlen.py
bitcoin/varlen.py