From: Jakub Zelenka <bukka@php.net>
Date: Sun, 25 Jun 2017 17:11:10 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha3~34^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e657f0d3f22c5582e2e2c630687f068f4acbe472;p=php

Merge branch 'PHP-7.1'
---

e657f0d3f22c5582e2e2c630687f068f4acbe472