From: Nikita Popov <nikic@php.net>
Date: Tue, 12 Jan 2016 15:48:44 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bef124513e04df99ebc098ceb59e20d49508c4d6;p=php

Merge branch 'PHP-7.0'
---

bef124513e04df99ebc098ceb59e20d49508c4d6