From: Stanislav Malyshev <stas@php.net>
Date: Fri, 23 Mar 2012 05:31:10 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~408
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e19cccad7b3deb466910cec1a95976e25d575db;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
  update for git
---

2e19cccad7b3deb466910cec1a95976e25d575db