]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.3:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.


Trivial merge