From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 7 Jan 2013 12:04:29 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4142a92b2ecfa0fdf89ec83bb41c2a46b299973;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - fix the fix for bug #50524
---

f4142a92b2ecfa0fdf89ec83bb41c2a46b299973