]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/5' into PHP-5.4
authorDavid Soria Parra <dsp@php.net>
Mon, 19 Mar 2012 21:11:02 +0000 (22:11 +0100)
committerDavid Soria Parra <dsp@php.net>
Mon, 19 Mar 2012 21:11:02 +0000 (22:11 +0100)
* pull-request/5:
  Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK


Trivial merge