Merge pull request #5039 from CEikermann/patch-1
authorjmarshallnz <jcmarsha@gmail.com>
Fri, 18 Jul 2014 06:37:53 +0000 (18:37 +1200)
committerjmarshallnz <jcmarsha@gmail.com>
Fri, 18 Jul 2014 06:37:53 +0000 (18:37 +1200)
Trac #15178: FTP TLS not working


Trivial merge