From: Nikita Popov <nikic@php.net>
Date: Sat, 16 Apr 2016 20:34:32 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12f42346a8646e45a83205c4e8fd9907622dc070;p=php

Merge branch 'PHP-7.0'
---

12f42346a8646e45a83205c4e8fd9907622dc070