]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Sat, 12 Jul 2014 03:15:03 +0000 (11:15 +0800)
committerTjerk Meesters <datibbaw@php.net>
Sat, 12 Jul 2014 03:15:03 +0000 (11:15 +0800)
1  2 
ext/standard/basic_functions.c

Simple merge