From: Stanislav Malyshev <stas@php.net>
Date: Fri, 15 Aug 2014 00:08:37 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed7ab762de586de1dec3d98297b6a464b6dac686;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test
---

ed7ab762de586de1dec3d98297b6a464b6dac686