From: Xinchen Hui <laruence@php.net>
Date: Mon, 11 Mar 2013 07:16:47 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~481^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4573405c5dd6686bbe443497dfad84de13ac5cc7;p=php

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

4573405c5dd6686bbe443497dfad84de13ac5cc7