From: Pierrick Charron <pierrick@php.net>
Date: Fri, 21 Dec 2012 16:49:00 +0000 (-0500)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d235eadc86b5cd730d2e4d683262c20f34aaa4e;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test
---

9d235eadc86b5cd730d2e4d683262c20f34aaa4e