From: Remi Collet <remi@php.net>
Date: Tue, 2 Apr 2013 14:31:45 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~8^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44dbe6a8155022cc9745dcbcb038cfda5ce3e8b8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  keep previous test to avoid any behavior change
---

44dbe6a8155022cc9745dcbcb038cfda5ce3e8b8