From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Wed, 5 Jul 2017 22:14:29 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0beta1~139
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b04b6b6a5b8f3f0a2e0bf9cb7d63490e82c161ae;p=php

Merge branch 'PHP-7.1'
---

b04b6b6a5b8f3f0a2e0bf9cb7d63490e82c161ae