]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorNikita Popov <nikic@php.net>
Fri, 27 Feb 2015 22:23:49 +0000 (23:23 +0100)
committerNikita Popov <nikic@php.net>
Fri, 27 Feb 2015 22:23:49 +0000 (23:23 +0100)
1  2 
ext/standard/basic_functions.c

Simple merge