From: Junio C Hamano Date: Tue, 20 Dec 2011 00:05:59 +0000 (-0800) Subject: Merge branch 'jk/maint-push-over-dav' X-Git-Tag: v1.7.9-rc0~45 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1d3a035d6d48bfa870b6ebe7c59f12b66e3a1b1c?hp=1d3a035d6d48bfa870b6ebe7c59f12b66e3a1b1c Merge branch 'jk/maint-push-over-dav' * jk/maint-push-over-dav: http-push: enable "proactive auth" t5540: test DAV push with authentication Conflicts: http.c ---