From: Johannes Schlüter <johannes@php.net>
Date: Thu, 19 Apr 2012 10:49:47 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2718cb9ffed2f8271e7c2c3c208f84b6feda1f7;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
---

d2718cb9ffed2f8271e7c2c3c208f84b6feda1f7