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

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

590ef15f6a492c7edddf8e76abdb608424f39fc3