From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 27 Feb 2014 01:32:47 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42a43d45317ac93c2ba934486879a0bc418bc34d;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

42a43d45317ac93c2ba934486879a0bc418bc34d