From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Oct 2011 23:04:32 +0000 (-0700)
Subject: Merge branch 'jc/unseekable-bundle'
X-Git-Tag: v1.7.8-rc0~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b76c561a74cd366786b7b762795fba1551b42149;p=git.git

Merge branch 'jc/unseekable-bundle'

* jc/unseekable-bundle:
  bundle: add parse_bundle_header() helper function
  bundle: allowing to read from an unseekable fd

Conflicts:
	transport.c
---

b76c561a74cd366786b7b762795fba1551b42149