From: Nikita Popov <nikic@php.net>
Date: Sun, 8 Jan 2017 12:48:54 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~589
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f25f46908835c9d2bc86cd52ca6572238d8040b0;p=php

Merge branch 'PHP-7.1'
---

f25f46908835c9d2bc86cd52ca6572238d8040b0