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

Merge branch 'PHP-7.0'
---

457aa82bd4cd29160b33deacf857e06e32e731b2