Merge branch 'ne/futz-upload-pack' into next
commit0120065b0da4acda84e1d2ba625e0363d3cbad45
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2009 08:21:17 +0000 (9 01:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2009 08:21:17 +0000 (9 01:21 -0700)
treebc8c98292d5f1ebab1dc533ab8ed707a31dc6099
parent370fd78777ca9343b688b6fe2b07456cc33aeb9b
parentf0cea83f631689331fce73b51f22707e897f7939
Merge branch 'ne/futz-upload-pack' into next

* ne/futz-upload-pack:
  Shift object enumeration out of upload-pack

Conflicts:
upload-pack.c
upload-pack.c