From: Jakub Zelenka <bukka@php.net>
Date: Sun, 12 Jun 2016 17:40:24 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha3~42^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e933da90283f31cecd89ca1840890bf98d9bf68c;p=php

Merge branch 'PHP-7.0'
---

e933da90283f31cecd89ca1840890bf98d9bf68c