From: Boris Lytochkin <lytboris@php.net>
Date: Thu, 7 Feb 2013 17:43:37 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
X-Git-Tag: php-5.5.0alpha5~22^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92a7924c1a97563cb73d37c369fdea4794203397;p=php

Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
---

92a7924c1a97563cb73d37c369fdea4794203397