From: Nikita Popov <nikic@php.net>
Date: Sun, 18 Dec 2016 13:58:38 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d404bc3d636a9bac94bf169dd31bb09fea8c7d5;p=php

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

7d404bc3d636a9bac94bf169dd31bb09fea8c7d5