]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 06:00:53 +0000 (06:00 +0000)
committerJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 06:00:53 +0000 (06:00 +0000)
commite9209e15a21e563defe02e0ce71f13bfa0dfbedd
tree4b39343cc7a14151b260a02a2951e8894c5b6929
parenta52afd27ab53ba94d0e3b0d95cbfe557eeb5bfbc
parent75ad2b301a047209e7b5a6b5912eb589cfbc773d
Merge branch 'PHP-7.0' into PHP-7.1

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