From: Xinchen Hui <laruence@php.net>
Date: Sun, 29 Jun 2014 10:06:44 +0000 (+0800)
Subject: Merge remote branch 'origin/PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa3243a40a50865494f139f776b1520d698ce030;p=php

Merge remote branch 'origin/PHP-5.6'
---

fa3243a40a50865494f139f776b1520d698ce030