Merge branch 'jk/maint-http-half-auth-push' into maint

author Junio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:29:24 +0000 (10:29 -0700)

committer Junio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:29:24 +0000 (10:29 -0700)
author: Junio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:29:24 +0000 (10:29 -0700)
committer: Junio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:29:24 +0000 (10:29 -0700)
diff --cc http.c
Simple merge
diff --cc remote-curl.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
author	Wed, 17 Oct 2012 17:29:24 +0000 (10:29 -0700)
committer	Junio C Hamano <gitster@pobox.com>
committer	Wed, 17 Oct 2012 17:29:24 +0000 (10:29 -0700)
		1	2
http.c	patch \|	diff1 \|	diff2 \|	blob \| history
remote-curl.c	patch \|	diff1 \|	diff2 \|	blob \| history