Merge branch 'np/maint-sideband-favor-status' into maint
commitef3a4fd670a4874f9b598ef96b10b89117b806e1
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:50:24 +0000 (3 13:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:50:24 +0000 (3 13:50 -0800)
tree7f3c3e505922f37e94b57aea625b4ad571a989bd
parent59a0a0bd579087cce9f7baf6627e5add5a538097
parent6b59f51b312f06d9420d34c09fa408c658aac6d2
Merge branch 'np/maint-sideband-favor-status' into maint

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