From: Xinchen Hui <laruence@php.net>
Date: Wed, 1 Aug 2012 15:56:44 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e378602464d2e457fe66a8790d288481c800575;p=php

Merge branch 'PHP-5.4'
---

7e378602464d2e457fe66a8790d288481c800575