From: Xinchen Hui <laruence@php.net>
Date: Wed, 10 Oct 2012 09:24:40 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~11^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a7b2a06420138d0e0f18a898cb36d007196a922;p=php

Merge branch 'PHP-5.4'
---

7a7b2a06420138d0e0f18a898cb36d007196a922