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

Merge branch 'PHP-7.0'
---

5a538e1d8221ddc6195036c516a8eab122bf39b5