]> granicus.if.org Git - php/commitdiff
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)
* PHP-7.0:
  increase wait time in timeout_variation_9.phpt by 1 second


Trivial merge