From: Joe Watkins <krakjoe@php.net>
Date: Fri, 3 Feb 2017 05:55:16 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.3RC1~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a52afd27ab53ba94d0e3b0d95cbfe557eeb5bfbc;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  increase wait time in timeout_variation_10.phpt by 1 second
---

a52afd27ab53ba94d0e3b0d95cbfe557eeb5bfbc