From: Xinchen Hui <laruence@php.net>
Date: Thu, 28 Mar 2013 15:23:07 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~448^2~65^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=127c78cb76b9f5431bd0b37cb8c253aa6dbe358a;p=php

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

127c78cb76b9f5431bd0b37cb8c253aa6dbe358a