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

Merge branch 'PHP-7.0'
---

30c82321d7c98a36682a755dbd55f67bcd19fe57