From: Johannes Schlüter <johannes@php.net>
Date: Wed, 18 Apr 2012 20:51:06 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~293
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15f552dbd0b6169a4d060b9649c5d2e21ac1e467;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
  update NEWS
---

15f552dbd0b6169a4d060b9649c5d2e21ac1e467