From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 27 Feb 2014 01:32:07 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd20278fa58f77879124783d3207a7fd6e059199;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
---

fd20278fa58f77879124783d3207a7fd6e059199