]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorChristopher Jones <sixd@php.net>
Mon, 19 Mar 2012 22:19:00 +0000 (15:19 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 19 Mar 2012 22:19:00 +0000 (15:19 -0700)
* PHP-5.4:
  Minor text changes (to try new git repo)
  Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK


Trivial merge