From: Nikita Popov <nikic@php.net>
Date: Fri, 9 Oct 2015 21:30:34 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~997
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1547d245a31ce0f4b837e7177d599113edb228f0;p=php

Merge branch 'PHP-7.0'
---

1547d245a31ce0f4b837e7177d599113edb228f0