Merge branch 'ne/futz-upload-pack'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2009 19:38:29 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2009 19:38:29 +0000 (12:38 -0700)
commit7d1b50981277c59a788298751f121567a1e75202
treef79499d734e14d789adb50cd76efc1ac4371d2c5
parentc39e9eb3df18c34330d50ebfae28b42880d9a4cc
parentf0cea83f631689331fce73b51f22707e897f7939
Merge branch 'ne/futz-upload-pack'

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

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