]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 20 May 2013 07:58:12 +0000 (00:58 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 20 May 2013 07:58:12 +0000 (00:58 -0700)
* PHP-5.5:
  fix bug #64660 - yyparse can return 2, not only 1


Trivial merge