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

Merge branch 'PHP-7.0'
---

fea822fe1babce5b61fd740c580fad7dda2a7e6e