From: Xinchen Hui <laruence@php.net>
Date: Tue, 15 Jan 2013 07:33:26 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fa5c1d22dbab9d84ee84973bed4d66ce91aa841;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

4fa5c1d22dbab9d84ee84973bed4d66ce91aa841