Merge branch 'PHP-5.4' into PHP-5.5

author Yasuo Ohgaki <yohgaki@php.net>

Mon, 27 Jan 2014 09:55:50 +0000 (18:55 +0900)

committer Yasuo Ohgaki <yohgaki@php.net>

Mon, 27 Jan 2014 09:55:50 +0000 (18:55 +0900)
author Yasuo Ohgaki <yohgaki@php.net>
Mon, 27 Jan 2014 09:55:50 +0000 (18:55 +0900)
committer Yasuo Ohgaki <yohgaki@php.net>
Mon, 27 Jan 2014 09:55:50 +0000 (18:55 +0900)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Yasuo Ohgaki <yohgaki@php.net>
	Mon, 27 Jan 2014 09:55:50 +0000 (18:55 +0900)
committer	Yasuo Ohgaki <yohgaki@php.net>
	Mon, 27 Jan 2014 09:55:50 +0000 (18:55 +0900)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history