From: Xinchen Hui <laruence@php.net>
Date: Sun, 29 Jul 2012 05:26:29 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=689fda310a7accaad6694056a0358a12d2459d90;p=php

Merge branch 'PHP-5.4'
---

689fda310a7accaad6694056a0358a12d2459d90