]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 06:01:10 +0000 (06:01 +0000)
committerJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 06:01:10 +0000 (06:01 +0000)
* PHP-7.1:
  increase wait time in timeout_variation_9.phpt by 1 second


Trivial merge