From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 19 Sep 2015 13:19:32 +0000 (-0700)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha2~40^2~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c282a525c8be86be2f2659ffe09407442220069;p=php

Merge branch 'PHP-7.0'

Conflicts:
	NEWS
---

9c282a525c8be86be2f2659ffe09407442220069