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

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

175b9f67f6780378ed60a43cb8a21fd85d7eaad5