From: Xinchen Hui <laruence@php.net>
Date: Tue, 10 Jun 2014 13:58:31 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d461afc3a2340066d429f5f4144edaed4f5fda82;p=php

Merge branch 'PHP-5.6'
---

d461afc3a2340066d429f5f4144edaed4f5fda82