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

Merge branch 'PHP-5.4'
---

e200c7ade02ef01c192189114c98bec47f0518bc