From: Xinchen Hui <laruence@php.net>
Date: Tue, 5 May 2015 03:07:02 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c50994dc0b1c9e7dfe0d21aed45079bfa15fec1d;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/opcache/ZendAccelerator.h
---

c50994dc0b1c9e7dfe0d21aed45079bfa15fec1d