Merge branch 'PHP-5.5' into PHP-5.6

author Stanislav Malyshev <stas@php.net>

Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)

committer Stanislav Malyshev <stas@php.net>

Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)
author Stanislav Malyshev <stas@php.net>
Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)
committer Stanislav Malyshev <stas@php.net>
Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)
diff --cc CODING_STANDARDS
Simple merge
diff --cc README.SUBMITTING_PATCH
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)
committer	Stanislav Malyshev <stas@php.net>
	Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)
		1	2
CODING_STANDARDS	patch \|	diff1 \|	diff2 \|	blob \| history
README.SUBMITTING_PATCH	patch \|	diff1 \|	diff2 \|	blob \| history