]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Mon, 16 Jan 2017 13:26:54 +0000 (14:26 +0100)
committerNikita Popov <nikic@php.net>
Mon, 16 Jan 2017 13:26:54 +0000 (14:26 +0100)
1  2 
ext/standard/var.c

Simple merge