From: Nikita Popov <nikic@php.net>
Date: Wed, 20 Apr 2016 17:00:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.7RC1~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85867268fdae2b742ce44bc76b7b57053d5063a8;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	Zend/zend_compile.c
---

85867268fdae2b742ce44bc76b7b57053d5063a8