Merge branch 'ml/http'
commitc535d767f7a518b79a0f9b9a70ec746de76da97c
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2009 08:00:36 +0000 (9 01:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2009 08:00:36 +0000 (9 01:00 -0700)
tree84f4889857e93a4a2bf526436ab0c9fd11855688
parent128a9d86da3c156c7d1bf25692eeb68a522af935
parent754ae192a4390baeb4d00b96e72c69023efb22ee
Merge branch 'ml/http'

* ml/http:
  http.c: add http.sslCertPasswordProtected option
  http.c: prompt for SSL client certificate password

Conflicts:
http.c
Documentation/config.txt
http.c