Merge branch 'np/maint-sideband-favor-status'mastermr_AIX-3-5_master_KNOWN_BUILDINGmr_AIX-3-5_master_KNOWN_PASSING
commite36e6c00cd60130f8792319a5aa0f56d2da68e14
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Nov 2009 06:03:20 +0000 (17 22:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Nov 2009 06:03:20 +0000 (17 22:03 -0800)
treeb78eb47745f965c463898141e4dfff0156cdd9d1
parentaa17bacc14362dbe076c5ea20531a21dea8677a7
parent6b59f51b312f06d9420d34c09fa408c658aac6d2
Merge branch 'np/maint-sideband-favor-status'

* np/maint-sideband-favor-status:
  give priority to progress messages
builtin-upload-archive.c
upload-pack.c