]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 05:55:16 +0000 (05:55 +0000)
committerJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 05:55:16 +0000 (05:55 +0000)
commita52afd27ab53ba94d0e3b0d95cbfe557eeb5bfbc
treefad61f1424cc016aaaa3abaa23d5939caf9ab5b1
parente81f30ad1d003c5250b1025c963ed0a178d4c51a
parent25271feeb0ab55fef89d4b7388277be06b21856d
Merge branch 'PHP-7.0' into PHP-7.1

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