]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 20:50:21 +0000 (22:50 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 20:50:21 +0000 (22:50 +0200)
commit900751e8ae4ed2af3e63e7c355fac59f6f932254
treeada5a6accea9b45e8b5deb5ef0483d194547835d
parent56d8d353009dbe9678fd292f205eaf32aca59b9e
parente946eaca0bc747615fabd0fedb8a92ea800ed158
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.