From: Xinchen Hui <laruence@php.net>
Date: Wed, 8 Jul 2015 14:35:10 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.1.1RC1~35^2~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5460929077fc71640a871bfd4cee38cce2b4b7eb;p=php

Merge branch 'PHP-5.6'
---

5460929077fc71640a871bfd4cee38cce2b4b7eb