]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Thu, 28 Sep 2017 13:45:09 +0000 (15:45 +0200)
committerAnatol Belski <ab@php.net>
Thu, 28 Sep 2017 13:45:09 +0000 (15:45 +0200)
* PHP-7.1:
  Apply upstream patch for CVE-2016-1283


Trivial merge