From: Joe Watkins <krakjoe@php.net>
Date: Mon, 9 Jan 2017 00:36:57 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b8dc330bfcb9449b61efa289730bf1efd3f26ab;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

3b8dc330bfcb9449b61efa289730bf1efd3f26ab