]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Fri, 7 Mar 2014 11:24:50 +0000 (19:24 +0800)
committerTjerk Meesters <datibbaw@php.net>
Fri, 7 Mar 2014 11:24:50 +0000 (19:24 +0800)
1  2 
ext/spl/spl_directory.c

Simple merge