From: Nikita Popov <nikic@php.net>
Date: Tue, 10 Jan 2017 22:19:30 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~93^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1bb30653091f6e8ab1b328c305d8e4322ef45a0;p=php

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

d1bb30653091f6e8ab1b328c305d8e4322ef45a0