From: Xinchen Hui <laruence@php.net>
Date: Mon, 2 Sep 2013 08:02:59 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.4RC1~2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd1cbd140b513f5d790c2d8b57f48717e6864ef1;p=php

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

dd1cbd140b513f5d790c2d8b57f48717e6864ef1