From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 12 Nov 2015 06:39:20 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~814^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f07c869593597467cf0ef2348ea039c72c7ab195;p=php

Merge branch 'PHP-7.0'

Conflicts:
	NEWS
---

f07c869593597467cf0ef2348ea039c72c7ab195