Merge branch 'PHP-5.5' into PHP-5.6

author Anatol Belski <ab@php.net>

Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)

committer Anatol Belski <ab@php.net>

Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)
author Anatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)
committer Anatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)
diff --cc ext/fileinfo/libmagic/apprentice.c
Simple merge
diff --cc ext/opcache/Optimizer/block_pass.c
Simple merge
author	Anatol Belski <ab@php.net>
	Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)
committer	Anatol Belski <ab@php.net>
	Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)
		1	2
ext/fileinfo/libmagic/apprentice.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/opcache/Optimizer/block_pass.c	patch \|	diff1 \|	diff2 \|	blob \| history