From: Stanislav Malyshev <stas@php.net>
Date: Sun, 26 Jan 2014 22:31:32 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~388^2~7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2bb54a246272fb8430002b46450300f27952330;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test
---

c2bb54a246272fb8430002b46450300f27952330