From: Jakub Zelenka <bukka@php.net>
Date: Fri, 17 Mar 2017 19:08:26 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.4RC1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebc75dab5052cb23e759626cc839448fecc9563b;p=php

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

ebc75dab5052cb23e759626cc839448fecc9563b