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

Merge branch 'PHP-5.6'
---

7691926bbeb8c36b2a8f19f18d4f9129fcd4c08a