]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 06:08:42 +0000 (22:08 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 06:08:42 +0000 (22:08 -0800)
* PHP-7.0:
  Use correct string release function

1  2 
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re

Simple merge
Simple merge