]> granicus.if.org Git - php/commit
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)
commit6400ce50179d9ffcd95ffefb56f8979962ba6cc4
treee71e0d49fd6201eea27676fb4ff0f6aecfef7eee
parent309d3daa39fa7df56bf958c69b2f3930dbcb780f
parente9209e15a21e563defe02e0ce71f13bfa0dfbedd
Merge branch 'PHP-7.1'

* PHP-7.1:
  increase wait time in timeout_variation_9.phpt by 1 second