]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Sat, 29 Nov 2014 11:11:06 +0000 (12:11 +0100)
committerJulien Pauli <jpauli@php.net>
Sat, 29 Nov 2014 11:11:06 +0000 (12:11 +0100)
* PHP-5.5:
  Updated NEWS
  SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME

1  2 
ext/spl/spl_directory.c

Simple merge