From: Nikita Popov <nikic@php.net>
Date: Wed, 20 Apr 2016 17:00:13 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~289^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0beb6d17e4aef5f5859461e78b561f8411088d1e;p=php

Merge branch 'PHP-7.0'
---

0beb6d17e4aef5f5859461e78b561f8411088d1e