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

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
---

0589b19abfa5a0182b0ec4b486af0cafb359989f