From: zoe slattery <zoe@php.net>
Date: Tue, 15 May 2012 13:40:49 +0000 (+0100)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~196
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=129c83056263da0adb11734ad1bea57e3abe62f5;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Changes to remaining two tests, #62022
---

129c83056263da0adb11734ad1bea57e3abe62f5