]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 3 Feb 2017 16:55:08 +0000 (17:55 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 3 Feb 2017 16:55:08 +0000 (17:55 +0100)
1  2 
ext/standard/string.c

Simple merge