From: Nikita Popov <nikic@php.net>
Date: Thu, 3 Mar 2016 22:20:50 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~529
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ed893712fe5b5bfb1d7257ce28e0bac7de8e1d0;p=php

Merge branch 'PHP-7.0'

Conflicts:
	ext/mysqlnd/mysqlnd_priv.h
	main/php_streams.h
---

7ed893712fe5b5bfb1d7257ce28e0bac7de8e1d0