From: Xinchen Hui <laruence@php.net>
Date: Wed, 2 Jul 2014 09:58:49 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cec7d479a61540b800d752ac7d359d41eecf8bc;p=php

Merge branch 'PHP-5.6'
---

4cec7d479a61540b800d752ac7d359d41eecf8bc