From: Nikita Popov <nikic@php.net>
Date: Thu, 5 Jan 2017 10:38:17 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=769e17ce9bc6b93790237622020ac3c08ceb1e18;p=php

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

769e17ce9bc6b93790237622020ac3c08ceb1e18