Merge branch 'PHP-5.5'

author Dmitry Stogov <dmitry@zend.com>

Wed, 27 Mar 2013 17:08:58 +0000 (21:08 +0400)

committer Dmitry Stogov <dmitry@zend.com>

Wed, 27 Mar 2013 17:08:58 +0000 (21:08 +0400)
author Dmitry Stogov <dmitry@zend.com>
Wed, 27 Mar 2013 17:08:58 +0000 (21:08 +0400)
committer Dmitry Stogov <dmitry@zend.com>
Wed, 27 Mar 2013 17:08:58 +0000 (21:08 +0400)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Wed, 27 Mar 2013 17:08:58 +0000 (21:08 +0400)
committer	Dmitry Stogov <dmitry@zend.com>
	Wed, 27 Mar 2013 17:08:58 +0000 (21:08 +0400)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history