Merge branch 'PHP-5.5'

author David Soria Parra <dsp@php.net>

Thu, 21 Mar 2013 14:52:12 +0000 (15:52 +0100)

committer David Soria Parra <dsp@php.net>

Thu, 21 Mar 2013 14:52:12 +0000 (15:52 +0100)
author David Soria Parra <dsp@php.net>
Thu, 21 Mar 2013 14:52:12 +0000 (15:52 +0100)
committer David Soria Parra <dsp@php.net>
Thu, 21 Mar 2013 14:52:12 +0000 (15:52 +0100)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	David Soria Parra <dsp@php.net>
	Thu, 21 Mar 2013 14:52:12 +0000 (15:52 +0100)
committer	David Soria Parra <dsp@php.net>
	Thu, 21 Mar 2013 14:52:12 +0000 (15:52 +0100)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history