From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 23 Nov 2015 10:30:41 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.1RC1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=397be4ff547abf7867c226feebb934d8a9a40b70;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	Zend/zend_compile.c
---

397be4ff547abf7867c226feebb934d8a9a40b70