From: Jakub Zelenka <bukka@php.net>
Date: Sun, 30 Apr 2017 19:27:39 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.6RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9622a3be436a300d45bf77524c2a75e628dca172;p=php

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

9622a3be436a300d45bf77524c2a75e628dca172