From: Xinchen Hui <laruence@php.net>
Date: Fri, 17 Aug 2012 10:30:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d93c888117a3f4e00f2e6a228d134eb336de2c2;p=php

Merge branch 'PHP-5.4'
---

3d93c888117a3f4e00f2e6a228d134eb336de2c2