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

Merge branch 'PHP-7.0'
---

bc1f884ef7c4d2e938aecabbdde2235c5d931c75