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

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

06699abffbee5d1466460bfa9e40e2759fb283f2