Merge branch 'PHP-5.5'

author Remi Collet <remi@php.net>

Thu, 11 Apr 2013 05:06:36 +0000 (07:06 +0200)

committer Remi Collet <remi@php.net>

Thu, 11 Apr 2013 05:06:36 +0000 (07:06 +0200)
author Remi Collet <remi@php.net>
Thu, 11 Apr 2013 05:06:36 +0000 (07:06 +0200)
committer Remi Collet <remi@php.net>
Thu, 11 Apr 2013 05:06:36 +0000 (07:06 +0200)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Remi Collet <remi@php.net>
	Thu, 11 Apr 2013 05:06:36 +0000 (07:06 +0200)
committer	Remi Collet <remi@php.net>
	Thu, 11 Apr 2013 05:06:36 +0000 (07:06 +0200)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history