From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 5 Feb 2016 11:52:24 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~20^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f9e1ab3b5c1d744b63899c7ce3426028ab1c18a;p=php

Merge branch 'PHP-7.0'

Conflicts:
	main/php_version.h
---

7f9e1ab3b5c1d744b63899c7ce3426028ab1c18a