Merge branch 'ne/futz-upload-pack' into jch
commit488ddd34befbde70fd5eeb1f22f56316e14c45f7
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:14 +0000 (2 23:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:14 +0000 (2 23:11 -0700)
treef988fe66412bca4f40f398219141572a01078ef5
parent07a4a3b4962e1fd4e40fd877427cddd7428c1bc3
parentf0cea83f631689331fce73b51f22707e897f7939
Merge branch 'ne/futz-upload-pack' into jch

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

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