From: Xinchen Hui <laruence@php.net>
Date: Tue, 15 Jan 2013 07:32:42 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.5.0alpha4~10^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bc74903706ab08e916905a0bd634e77aa804def;p=php

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

3bc74903706ab08e916905a0bd634e77aa804def