From: Stanislav Malyshev <stas@php.net>
Date: Wed, 2 Jan 2013 05:24:37 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39df129161bf6114130f192cdf8a5650243c81d8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add fix #43177
---

39df129161bf6114130f192cdf8a5650243c81d8