From: Stanislav Malyshev <stas@php.net>
Date: Tue, 17 Mar 2015 19:56:37 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.24RC1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34418222d784f0b3666649fb9afb05ffcf5cedb7;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests
---

34418222d784f0b3666649fb9afb05ffcf5cedb7