From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Jan 2017 11:20:46 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a340423236938b8c6962f245f0ba99a6345d2f3;p=php

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

2a340423236938b8c6962f245f0ba99a6345d2f3