From: Xinchen Hui <laruence@php.net>
Date: Sat, 9 Mar 2013 03:38:32 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~484^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af5ada3871d110add52f5a5df8c601d994b9345b;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

af5ada3871d110add52f5a5df8c601d994b9345b