From: Nikita Popov <nikic@php.net>
Date: Wed, 18 Jan 2017 20:20:00 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fec3a65ba459e54ef3895ae2fdefe991306860a4;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

fec3a65ba459e54ef3895ae2fdefe991306860a4