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

Merge branch 'PHP-5.4'
---

9e2530bfe48ecdfd61017a01e71d5f4db68e9c5f