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

Merge branch 'PHP-5.6'
---

a99e7eeab9bddbbd548660e53f129084a1650dea