From: Stanislav Malyshev <stas@php.net>
Date: Wed, 16 May 2012 06:30:34 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=910a4696e19eba9801473d5a275330495ea14215;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Revert "Update test to fix breakage caused by the previous commit."
  fix test
  to 5.4.5-dev
---

910a4696e19eba9801473d5a275330495ea14215