Merge branch 'PHP-5.5.33' into PHP-5.6.19

author Stanislav Malyshev <stas@php.net>

Wed, 2 Mar 2016 06:40:00 +0000 (22:40 -0800)

committer Stanislav Malyshev <stas@php.net>

Wed, 2 Mar 2016 06:40:00 +0000 (22:40 -0800)
author Stanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 06:40:00 +0000 (22:40 -0800)
committer Stanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 06:40:00 +0000 (22:40 -0800)
diff --cc ext/phar/zip.c
Simple merge
diff --cc ext/wddx/wddx.c
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Wed, 2 Mar 2016 06:40:00 +0000 (22:40 -0800)
committer	Stanislav Malyshev <stas@php.net>
	Wed, 2 Mar 2016 06:40:00 +0000 (22:40 -0800)
		1	2
ext/phar/zip.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/wddx/wddx.c	patch \|	diff1 \|	diff2 \|	blob \| history