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

Merge branch 'PHP-5.4'
---

460d258e57595b4871beed44975f19632e819dd4