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

diff --cc Documentation/config.txt
Simple merge

diff --cc http.c
Simple merge

diff --cc http.h
Simple merge