From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 4 Nov 2015 01:56:05 +0000 (-0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~871
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4a767e6da477ae84e1c7e442fef64f99a4dbbc4;p=php

Merge branch 'PHP-7.0'

Conflicts:
	Zend/zend_vm_execute.h
---

a4a767e6da477ae84e1c7e442fef64f99a4dbbc4