From: Nikita Popov <nikic@php.net>
Date: Thu, 21 Apr 2016 21:42:20 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dc8f80b616b913f9a6fbf75a6f8d330e4824be2;p=php

Merge branch 'PHP-7.0'
---

3dc8f80b616b913f9a6fbf75a6f8d330e4824be2