]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Thu, 8 Sep 2016 15:51:24 +0000 (17:51 +0200)
committerAnatol Belski <ab@php.net>
Thu, 8 Sep 2016 15:51:24 +0000 (17:51 +0200)
* PHP-7.1:
  backport 59444347 and 3d7343f6


Trivial merge