From: Joe Watkins <krakjoe@php.net>
Date: Fri, 3 Feb 2017 05:55:29 +0000 (+0000)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~421
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=309d3daa39fa7df56bf958c69b2f3930dbcb780f;p=php

Merge branch 'PHP-7.1'

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

309d3daa39fa7df56bf958c69b2f3930dbcb780f