From: Pierrick Charron <pierrick@php.net>
Date: Wed, 27 Jul 2016 04:38:54 +0000 (-0400)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.10RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6714f73545a8a186931f6fa91c23c4b700ba8ef7;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	main/streams/streams.c
---

6714f73545a8a186931f6fa91c23c4b700ba8ef7