From: Joe Watkins <krakjoe@php.net>
Date: Mon, 9 Jan 2017 00:37:24 +0000 (+0000)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~582
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04db4ad4e3f51aba5a02b417bd47f7cb7f90f8e6;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix FTP tests for Travis CI.
---

04db4ad4e3f51aba5a02b417bd47f7cb7f90f8e6