From: Xinchen Hui <laruence@php.net>
Date: Thu, 21 Mar 2013 07:58:08 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2383dead69d59143fee1d54de98f154d6833714;p=php

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

f2383dead69d59143fee1d54de98f154d6833714