]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27a5f66 bfd2637)
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)
* 'PHP-7.0' of git.php.net:php-src:
  fix test
  Ensure timeout tests wait for the entire specified duration


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.