From: Stanislav Malyshev <stas@php.net>
Date: Wed, 23 Jan 2013 18:45:01 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~58^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d86e14b8f6bc7213d597cc6beb94a573fefb6889;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests
---

d86e14b8f6bc7213d597cc6beb94a573fefb6889