From: Nikita Popov <nikic@php.net>
Date: Mon, 12 Oct 2015 18:37:55 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~976
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f06c0b2eaad4a008a639d16cbe2ddbc40bbad0f;p=php

Merge branch 'PHP-7.0'
---

2f06c0b2eaad4a008a639d16cbe2ddbc40bbad0f