From: Christopher Jones <sixd@php.net>
Date: Mon, 19 Mar 2012 22:19:00 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~422
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faa731f1477d64c946d718e5b7d53406e111b790;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Minor text changes (to try new git repo)
  Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
---

faa731f1477d64c946d718e5b7d53406e111b790