From: Nikita Popov <nikic@php.net>
Date: Sat, 23 Jul 2016 22:08:18 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~86^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42e995e0d39e2de80cedcad1868957743147dad2;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

42e995e0d39e2de80cedcad1868957743147dad2