Merge branch 'PHP-5.5' into PHP-5.6

author Reeze Xia <reeze@php.net>

Sat, 28 Feb 2015 08:40:06 +0000 (16:40 +0800)

committer Reeze Xia <reeze@php.net>

Sat, 28 Feb 2015 08:40:06 +0000 (16:40 +0800)
author Reeze Xia <reeze@php.net>
Sat, 28 Feb 2015 08:40:06 +0000 (16:40 +0800)
committer Reeze Xia <reeze@php.net>
Sat, 28 Feb 2015 08:40:06 +0000 (16:40 +0800)
diff --cc ext/date/php_date.c
Simple merge
diff --cc ext/standard/basic_functions.c
Simple merge
author	Reeze Xia <reeze@php.net>
	Sat, 28 Feb 2015 08:40:06 +0000 (16:40 +0800)
committer	Reeze Xia <reeze@php.net>
	Sat, 28 Feb 2015 08:40:06 +0000 (16:40 +0800)
		1	2
ext/date/php_date.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/basic_functions.c	patch \|	diff1 \|	diff2 \|	blob \| history