From: Xinchen Hui <laruence@php.net>
Date: Sat, 24 May 2014 13:11:26 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc8a53d4baeb2a4c97b367b78b3d47b53fe6ecbb;p=php

Merge branch 'PHP-5.6'
---

dc8a53d4baeb2a4c97b367b78b3d47b53fe6ecbb