From: Jakub Zelenka <bukka@php.net>
Date: Wed, 26 Apr 2017 14:01:27 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha2~15^2~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f29e90ff753e24da18472b2ef9acad71b33fc3df;p=php

Merge branch 'PHP-7.1'
---

f29e90ff753e24da18472b2ef9acad71b33fc3df