From: Xinchen Hui <laruence@php.net>
Date: Tue, 14 Jan 2014 14:34:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~388^2~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aca07343ce2e661495cf31e7e52b008b643797ce;p=php

Merge branch 'PHP-5.6'
---

aca07343ce2e661495cf31e7e52b008b643797ce