From: Nikita Popov <nikic@php.net>
Date: Tue, 3 Jan 2017 01:13:04 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a08747bb4c43bb6c1be77e65a98b8bd7fb3a3fe9;p=php

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

a08747bb4c43bb6c1be77e65a98b8bd7fb3a3fe9