Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Apr 2012 20:38:41 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Apr 2012 20:38:41 +0000 (13:38 -0700)
* cb/maint-t5541-make-server-port-portable:
  t5541: check error message against the real port number used
  remote-curl: Fix push status report when all branches fail

1  2 
remote-curl.c
t/t5541-http-push.sh

diff --cc remote-curl.c
Simple merge
Simple merge