]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 06:04:10 +0000 (22:04 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 06:04:10 +0000 (22:04 -0800)
* PHP-7.1:
  Fix error reporting

1  2 
ext/standard/var_unserializer.re

Simple merge