From: Xinchen Hui <laruence@php.net>
Date: Mon, 1 Oct 2012 16:31:47 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~14^2~5^2~2^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62fa875f3e3222c74067f2500db502e99d03095e;p=php

Merge branch 'PHP-5.4'
---

62fa875f3e3222c74067f2500db502e99d03095e