From: Nikita Popov <nikic@php.net>
Date: Tue, 29 Mar 2016 17:29:55 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~397
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e514d859150aa60b425e960b6467b4b124b466dd;p=php

Merge branch 'PHP-7.0'
---

e514d859150aa60b425e960b6467b4b124b466dd