From: Xinchen Hui <laruence@php.net>
Date: Fri, 19 Oct 2012 03:24:56 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c018d09c331822d02ede76a9f344d9337537afe5;p=php

Merge branch 'PHP-5.4'
---

c018d09c331822d02ede76a9f344d9337537afe5