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

diff --cc bundle.c
Simple merge

diff --cc bundle.h
Simple merge

diff --cc transport.c
Simple merge