From: Remi Collet <remi@php.net>
Date: Mon, 16 Jun 2014 08:52:39 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ced7f0ea1232cd22e3ad121022eaa7c995587d3f;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix failed test
---

ced7f0ea1232cd22e3ad121022eaa7c995587d3f