]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 20 May 2013 07:55:48 +0000 (00:55 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 20 May 2013 07:57:34 +0000 (00:57 -0700)
commitac0aa5737e6eff93d1cf83d6a6b1c8f1227775c4
treea874a449237cc7b03f5e9766807c7779a76eefcb
parent0f02c3aa29fdf656457bfda1d1147b77ad9d1959
parentfb58e69a84f4fde603a630d2c9df2fa3be16d846
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
NEWS
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l