]> granicus.if.org Git - php/commit
Merge branch 'pull-request/2359' into PHP-7.0
authorJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 06:00:34 +0000 (06:00 +0000)
committerJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 06:00:34 +0000 (06:00 +0000)
commit75ad2b301a047209e7b5a6b5912eb589cfbc773d
tree54959979100d5e36b52f8ba374ef28fc4836f1bf
parent25271feeb0ab55fef89d4b7388277be06b21856d
parent0b56ba51d0ad6b15116fa12d6b978b69c7b0992c
Merge branch 'pull-request/2359' into PHP-7.0

* pull-request/2359:
  increase wait time in timeout_variation_9.phpt by 1 second