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

Simple merge
Simple merge