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

Merge branch 'PHP-5.6' into PHP-7.0

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

54c04befc2817c4ce85fffee47ccd448e280423a