From: Xinchen Hui <laruence@php.net>
Date: Mon, 26 May 2014 07:40:57 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~263
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdacf4c90aa26a7f99dc940fb06f32c3960d6512;p=php

Merge branch 'PHP-5.6'
---

cdacf4c90aa26a7f99dc940fb06f32c3960d6512