Merge branch 'jk/maint-push-over-dav'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:05:59 +0000 (16:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:05:59 +0000 (16:05 -0800)
commit1d3a035d6d48bfa870b6ebe7c59f12b66e3a1b1c
tree58d0280090c8c26915a20c894a84b7a951ac8004
parentb3ae9d8e57166c771926e3f55555bf248b71202a
parenta4ddbc33d7906f0e10c68c140a9a1003d9715a77
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
http.c
http.h
remote-curl.c