From: Joe Watkins <krakjoe@php.net>
Date: Fri, 13 Jan 2017 06:45:17 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19363de12f663f20a6e0e9969c55710ca3c9fe4f;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability
---

19363de12f663f20a6e0e9969c55710ca3c9fe4f