From: Xinchen Hui <laruence@php.net>
Date: Tue, 23 Oct 2012 03:35:20 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~18^2~3^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cce2a1e7680da9803e9f20c981d83a3641d3d9a;p=php

Merge branch 'PHP-5.4'
---

0cce2a1e7680da9803e9f20c981d83a3641d3d9a