]> granicus.if.org Git - php/commit
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)
commit3ce366b7cd079b24c749da85ec934259f4232044
tree454eb2f857cc415a242e709640dae2bcb14708b4
parentfe1c83925c2fdd9c4ce7922550a224607160124d
parentac0aa5737e6eff93d1cf83d6a6b1c8f1227775c4
Merge branch 'PHP-5.5'

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