From: Stanislav Malyshev <stas@php.net>
Date: Tue, 7 Jul 2015 06:03:05 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.27~1^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09de64a58dd1dded8c178657f082741b92830b3d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #69958
---

09de64a58dd1dded8c178657f082741b92830b3d