From: Nikita Popov <nikic@php.net>
Date: Mon, 6 Apr 2015 20:09:22 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f53e20e59532ec8c3a502f730c502274120bea3e;p=php

Merge branch 'PHP-5.6'

Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_language_parser.y
---

f53e20e59532ec8c3a502f730c502274120bea3e