From: Nikita Popov <nikic@php.net>
Date: Fri, 18 Nov 2016 16:56:28 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~884^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c53fe3413c3065430efee7f8ab97db3e1e86a73;p=php

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

6c53fe3413c3065430efee7f8ab97db3e1e86a73