]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:59:59 +0000 (21:59 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:59:59 +0000 (21:59 -0800)
commit0f0406a1c98337d02b1f69ec23567cb99bdcf8e0
tree0926cafa3ca44ba32be701a3f8f24e57f622a4c6
parentca72faa2c50b249715597bbee51fcd01718a0494
parentea6e54aff376926fb9ef83411f732b9477cf9b11
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix error reporting
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re