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

Merge branch 'PHP-5.4'
---

c1a7369a40d78d26c7851172e040c421a92d5990