]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/2360' into PHP-7.0
authorJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 05:54:50 +0000 (05:54 +0000)
committerJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 05:54:50 +0000 (05:54 +0000)
* pull-request/2360:
  increase wait time in timeout_variation_10.phpt by 1 second


Trivial merge