Add environmental variable 'GIT_CURL_PROXYAUTH' to control proxy authentication methods.
Merge branch 'master' of https://github.com/CeramiqueHeart/git

Conflicts:
	http.c