From: Nikita Popov <nikic@php.net>
Date: Fri, 11 Mar 2016 21:45:52 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3b61b706fa0e477be9d8130d58d0a98824fa2c3;p=php

Merge branch 'PHP-7.0'
---

f3b61b706fa0e477be9d8130d58d0a98824fa2c3