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

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

12922f2a58e9f70185fb794d4a86458b34a749cb