From: Jakub Zelenka <bukka@php.net>
Date: Sun, 25 Oct 2015 17:57:15 +0000 (+0000)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~904
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=187c21979acf717230dc3e3dfb6f4588dddee428;p=php

Merge branch 'PHP-7.0'
---

187c21979acf717230dc3e3dfb6f4588dddee428