Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #64660 - yyparse can return 2, not only 1

Conflicts:
	Zend/zend_language_scanner.c

diff --cc NEWS
index 95ef3dcce5c75e935e6a2094d08b173fd49ccbd5,2dc8815f4d3aa8d329e19cef2108d7c87928e06a..2158504eb67e9b912a5827183368478af8b16801
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,13 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.16
 +?? ??? 2013, PHP 5.5.0 Release Candidate 2
  
  - Core:
 -  . Fixed bug #64729 (compilation failure on x32). (Gustavo)
+   . Fixed bug #64660 (Segfault on memory exhaustion within function definition).
+     (Stas)
 -  . Fixed bug #64853 (Use of no longer available ini directives causes crash on
 -    TS build). (Anatol)
 +  . Fixed bug #64853 (Use of no longer available ini directives causes crash
 +    on TS build). (Anatol)
  
  - Fileinfo:
    . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol)

diff --cc Zend/zend_language_scanner.c
Simple merge

diff --cc Zend/zend_language_scanner.l
Simple merge