From: Nikita Popov <nikic@php.net>
Date: Fri, 13 Mar 2015 15:29:39 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~672
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cd6a9845d2ef42ce6caff86a01b03cf99835e30;p=php

Merge branch 'PHP-5.6'

Conflicts:
	Zend/zend_generators.c
	Zend/zend_generators.h
---

3cd6a9845d2ef42ce6caff86a01b03cf99835e30