From: Anatol Belski <ab@php.net>
Date: Tue, 7 Feb 2017 11:03:21 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.3RC1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=265c53dbbf3ea310895a728495e9bd319d6d5793;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  switch to smart str conversion routine to hide exact NAN type
---

265c53dbbf3ea310895a728495e9bd319d6d5793