From: Xinchen Hui <laruence@php.net>
Date: Tue, 31 Jul 2012 14:43:10 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38c38e677e2ad4ede3cb7ace2cbcbd152c6dd281;p=php

Merge branch 'PHP-5.4'
---

38c38e677e2ad4ede3cb7ace2cbcbd152c6dd281