From: Julien Pauli <jpauli@php.net>
Date: Tue, 12 Jul 2016 13:27:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta1~92^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c96a9ca6f5630495fe2b34ca709111160a156684;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix test for #52384
---

c96a9ca6f5630495fe2b34ca709111160a156684