]> granicus.if.org Git - php/commit
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)
commitfaa731f1477d64c946d718e5b7d53406e111b790
tree01472b739e667a339987c3aaf2bcae67c1b0a069
parent3930e1e992247c0e0cb61f3207344889ea069da4
parent08f586984f7f067c005d7a252e76f8ddeabb6aec
Merge branch 'PHP-5.4'

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