From: Nikita Popov <nikic@php.net>
Date: Tue, 22 Nov 2016 18:25:53 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c733a345f65c34eb05c93af127338c0583d3065;p=php

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

1c733a345f65c34eb05c93af127338c0583d3065