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

Merge branch 'PHP-5.4'
---

6c7c2d0c03adf485274a0262aceb49332f66dca7