From: Xinchen Hui <laruence@php.net>
Date: Thu, 20 Feb 2014 03:20:01 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6557bc48e2f4067c8335c7fdcf1e0cc7d24558e5;p=php

Merge branch 'PHP-5.6'
---

6557bc48e2f4067c8335c7fdcf1e0cc7d24558e5