From: Nikita Popov <nikic@php.net>
Date: Thu, 3 Mar 2016 16:14:25 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~532
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=536b08fa181940036cc30fa95dfdf2279cb8e932;p=php

Merge branch 'PHP-7.0'
---

536b08fa181940036cc30fa95dfdf2279cb8e932