From: Nikita Popov <nikic@php.net>
Date: Sun, 8 Jan 2017 12:48:48 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b38e6a54cf4500780fd8ba68ae66714a0f21dd86;p=php

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

b38e6a54cf4500780fd8ba68ae66714a0f21dd86