From: Xinchen Hui <laruence@php.net>
Date: Tue, 25 Jun 2013 05:38:50 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d9ec2a90e59d939f2281d29dd6b9caed4f14a39;p=php

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

9d9ec2a90e59d939f2281d29dd6b9caed4f14a39