Merge branch 'PHP-5.4' into PHP-5.5

author Dmitry Stogov <dmitry@zend.com>

Wed, 9 Jan 2013 13:52:48 +0000 (17:52 +0400)

committer Dmitry Stogov <dmitry@zend.com>

Wed, 9 Jan 2013 13:52:48 +0000 (17:52 +0400)
author Dmitry Stogov <dmitry@zend.com>
Wed, 9 Jan 2013 13:52:48 +0000 (17:52 +0400)
committer Dmitry Stogov <dmitry@zend.com>
Wed, 9 Jan 2013 13:52:48 +0000 (17:52 +0400)
diff --cc Zend/zend_compile.c
Simple merge
diff --cc Zend/zend_language_parser.y
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Wed, 9 Jan 2013 13:52:48 +0000 (17:52 +0400)
committer	Dmitry Stogov <dmitry@zend.com>
	Wed, 9 Jan 2013 13:52:48 +0000 (17:52 +0400)
		1	2
Zend/zend_compile.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_language_parser.y	patch \|	diff1 \|	diff2 \|	blob \| history