From: Nikita Popov <nikic@php.net>
Date: Mon, 25 Jul 2016 21:04:14 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d2479202aef57d19e24c492bdabd0ac13474676;p=php

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

4d2479202aef57d19e24c492bdabd0ac13474676