From: Nikita Popov <nikic@php.net>
Date: Sun, 18 Dec 2016 16:10:54 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ef4e34c2ef59a2e3b85e7a4f64d2c3f371b61e0;p=php

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

4ef4e34c2ef59a2e3b85e7a4f64d2c3f371b61e0