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)
commit25271feeb0ab55fef89d4b7388277be06b21856d
tree1332f705eafc2928e43ac23c2de67dc8e245499e
parentdd9cf23457e21d2bda29dc92d437b9dbd14027b2
parent8faf5f979cccc59d02b775a15df93419714565a2
Merge branch 'pull-request/2360' into PHP-7.0

* pull-request/2360:
  increase wait time in timeout_variation_10.phpt by 1 second