From: Stanislav Malyshev <stas@php.net>
Date: Tue, 24 Jun 2014 05:13:32 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=232ab8d795103086c79f80542dad297b7efadf1a;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #67072 with more BC provisions
---

232ab8d795103086c79f80542dad297b7efadf1a