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

Merge branch 'PHP-7.0'
---

c9d8dfed60e6a7140fd6e34db6ab1ebe8ba66557