]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Wed, 1 Feb 2017 12:45:45 +0000 (13:45 +0100)
committerAnatol Belski <ab@php.net>
Wed, 1 Feb 2017 12:45:45 +0000 (13:45 +0100)
* PHP-7.0:
  fix possible NULL dereference


Trivial merge