From: Xinchen Hui <laruence@php.net>
Date: Tue, 6 Aug 2013 07:39:33 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2~32^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa042d0c351056d4ee5ecc994cd596f7fbb427ea;p=php

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

aa042d0c351056d4ee5ecc994cd596f7fbb427ea