From: Stanislav Malyshev <stas@php.net>
Date: Mon, 1 Jun 2015 00:30:41 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0fb8c8b7f7cf85583ea38ab63a7776f29f1443b;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  improve fix for Bug #69545
---

e0fb8c8b7f7cf85583ea38ab63a7776f29f1443b