From: Nikita Popov <nikic@php.net>
Date: Mon, 9 Jan 2017 22:22:59 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61af3ed38ac24c4cd4ca3fbb9a9b70054bb3deaa;p=php

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

61af3ed38ac24c4cd4ca3fbb9a9b70054bb3deaa