From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 6 Nov 2015 03:38:59 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~859
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48364afecb175ceb75baf7eec8c7a6152ec40a24;p=php

Merge branch 'PHP-7.0'

Conflicts:
	NEWS
---

48364afecb175ceb75baf7eec8c7a6152ec40a24