From: Matteo Beccati <mbeccati@php.net>
Date: Sun, 27 Nov 2016 09:20:50 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~183
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=461add8adf697a59e390dc4e07ae414939bb8abd;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix occasionaly failing test
---

461add8adf697a59e390dc4e07ae414939bb8abd