Merge branch 'PHP-7.0'

author Remi Collet <remi@php.net>

Mon, 22 Feb 2016 08:26:48 +0000 (09:26 +0100)

committer Remi Collet <remi@php.net>

Mon, 22 Feb 2016 08:26:48 +0000 (09:26 +0100)
author Remi Collet <remi@php.net>
Mon, 22 Feb 2016 08:26:48 +0000 (09:26 +0100)
committer Remi Collet <remi@php.net>
Mon, 22 Feb 2016 08:26:48 +0000 (09:26 +0100)
diff --cc ext/zip/php_zip.h
Simple merge
diff --cc ext/zip/zip_stream.c
Simple merge
author	Remi Collet <remi@php.net>
	Mon, 22 Feb 2016 08:26:48 +0000 (09:26 +0100)
committer	Remi Collet <remi@php.net>
	Mon, 22 Feb 2016 08:26:48 +0000 (09:26 +0100)
		1	2
ext/zip/php_zip.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext/zip/zip_stream.c	patch \|	diff1 \|	diff2 \|	blob \| history