From: Andrey Hristov <andrey@php.net>
Date: Mon, 4 Feb 2013 13:15:58 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
X-Git-Tag: php-5.5.0alpha5~42^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=643ce95b5bd80e744c7f5e6ac33138f40ed9a1f7;p=php

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

643ce95b5bd80e744c7f5e6ac33138f40ed9a1f7