Merge branch 'PHP-5.5' into PHP-5.6

author Stanislav Malyshev <stas@php.net>

Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)

committer Stanislav Malyshev <stas@php.net>

Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)
author Stanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)
committer Stanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)
diff --cc ext/exif/exif.c
Simple merge
diff --cc ext/standard/var_unserializer.c
Simple merge
diff --cc ext/standard/var_unserializer.re
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)
committer	Stanislav Malyshev <stas@php.net>
	Tue, 20 Jan 2015 18:40:39 +0000 (10:40 -0800)
		1	2
ext/exif/exif.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/var_unserializer.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/var_unserializer.re	patch \|	diff1 \|	diff2 \|	blob \| history