From: Xinchen Hui <laruence@php.net>
Date: Tue, 11 Sep 2012 03:44:33 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~23^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e64681740ea64303647921a2f595c16b89f73ef;p=php

Merge branch 'PHP-5.4'
---

7e64681740ea64303647921a2f595c16b89f73ef