From: Stanislav Malyshev <stas@php.net>
Date: Thu, 11 Jun 2015 08:52:39 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha2~2^2~171
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f69e5d3b19bc0b0980bf0b05dfdfe75786967919;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix bad copypaste
---

f69e5d3b19bc0b0980bf0b05dfdfe75786967919