Merge branch 'PHP-7.0'

author Anatol Belski <ab@php.net>

Mon, 7 Dec 2015 21:55:24 +0000 (22:55 +0100)

committer Anatol Belski <ab@php.net>

Mon, 7 Dec 2015 21:55:24 +0000 (22:55 +0100)
author Anatol Belski <ab@php.net>
Mon, 7 Dec 2015 21:55:24 +0000 (22:55 +0100)
committer Anatol Belski <ab@php.net>
Mon, 7 Dec 2015 21:55:24 +0000 (22:55 +0100)
diff --cc ext/opcache/ZendAccelerator.c
Simple merge
diff --cc ext/opcache/ZendAccelerator.h
Simple merge
author	Anatol Belski <ab@php.net>
	Mon, 7 Dec 2015 21:55:24 +0000 (22:55 +0100)
committer	Anatol Belski <ab@php.net>
	Mon, 7 Dec 2015 21:55:24 +0000 (22:55 +0100)
		1	2
ext/opcache/ZendAccelerator.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/opcache/ZendAccelerator.h	patch \|	diff1 \|	diff2 \|	blob \| history