Merge branch 'mv/ssl-ftp-curl'
commit574d51b575d9025d57c610c3b571ca58d347d0da
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Apr 2013 20:31:08 +0000 (19 13:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Apr 2013 20:31:08 +0000 (19 13:31 -0700)
tree5f409c38a354aace88e787d5417798cf6ded7d0d
parent1468a5839309033feb2e58943babdd48b8e2d151
parent4bc444eb64173f770c1d1dba2ed3db393c2a9b18
Merge branch 'mv/ssl-ftp-curl'

Does anybody really use commit walkers over (s)ftp?

* mv/ssl-ftp-curl:
  Support FTP-over-SSL/TLS for regular FTP
Documentation/config.txt
http.c
http.h