From: Xinchen Hui <laruence@php.net>
Date: Thu, 3 Jul 2014 02:52:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ef8a44359ca086b731d74834e2441f6ba2cc43e;p=php

Merge branch 'PHP-5.6'
---

4ef8a44359ca086b731d74834e2441f6ba2cc43e