From: Nikita Popov <nikic@php.net>
Date: Thu, 3 Mar 2016 22:50:51 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~528
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a0594d12db688140764c92839e56d3ffef00c2d;p=php

Merge branch 'PHP-7.0'
---

5a0594d12db688140764c92839e56d3ffef00c2d