From: Nikita Popov <nikic@php.net>
Date: Thu, 29 Dec 2016 20:00:14 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7746ed9d5f2e195e26b6e468c303dc1e86af12af;p=php

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

7746ed9d5f2e195e26b6e468c303dc1e86af12af