From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 29 Sep 2015 11:11:39 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
X-Git-Tag: php-7.0.0RC4~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27d4d32e6bd4c6ff2f65d162e9478671348764f4;p=php

Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:php-src:
  fix test
  Ensure timeout tests wait for the entire specified duration
---

27d4d32e6bd4c6ff2f65d162e9478671348764f4