From: Anatol Belski <ab@php.net>
Date: Tue, 11 Mar 2014 10:53:17 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~495^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54a18f3be6bbff4d98177721a61160a529858e01;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

54a18f3be6bbff4d98177721a61160a529858e01