From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Jul 2009 08:00:36 +0000 (-0700)
Subject: Merge branch 'ml/http'
X-Git-Tag: v1.6.4-rc0~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c535d767f7a518b79a0f9b9a70ec746de76da97c?hp=c535d767f7a518b79a0f9b9a70ec746de76da97c

Merge branch 'ml/http'

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

Conflicts:
http.c
---