From: Xinchen Hui <laruence@php.net>
Date: Thu, 2 Aug 2012 04:55:43 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ac50cfe3f6fb825298e3d81ec1a527d9e2a3e5d;p=php

Merge branch 'PHP-5.4'
---

3ac50cfe3f6fb825298e3d81ec1a527d9e2a3e5d