From: Anatol Belski <ab@php.net>
Date: Tue, 11 Mar 2014 10:51:35 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72050af85538ff1d1b56480dfa2d2d9f7f94b016;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  restored the old code in 5.4/5 related to bug #66872
---

72050af85538ff1d1b56480dfa2d2d9f7f94b016