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

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

7dd661d0cdd49aece19d707bb46ab010f7e21e1e