From: Nikita Popov <nikic@php.net>
Date: Wed, 30 Mar 2016 16:32:29 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~395^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29bc5a0b0f19f4ddb407378e347602f37dfc84bb;p=php

Merge branch 'PHP-7.0'
---

29bc5a0b0f19f4ddb407378e347602f37dfc84bb