]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
authorDmitry Stogov <dmitry@zend.com>
Tue, 29 Sep 2015 11:11:39 +0000 (14:11 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 29 Sep 2015 11:11:39 +0000 (14:11 +0300)
commit27d4d32e6bd4c6ff2f65d162e9478671348764f4
treec565d96a976e08e3173bb312caf60344a9f1d28d
parent27a5f66da4634d81fa670786d7b47cca76b4db92
parentbfd26370682b5b90ea63a4bbf5a7a9c6ce3f5866
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