From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 28 Mar 2013 11:13:58 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~448^2~67^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4daaf925028891e6087fda2d4c0e4162b9f2b63;p=php

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

f4daaf925028891e6087fda2d4c0e4162b9f2b63