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

Merge branch 'PHP-5.4'

* PHP-5.4:
  Small fixes to tests, see #62022
---

3556efc8e21161fe33f53149e8d4daa3831f2763