From: Nikita Popov <nikic@php.net>
Date: Thu, 29 Dec 2016 20:18:58 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~730
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=270f1ffd19bccf799ece32ce136842edd69a333a;p=php

Merge branch 'PHP-7.1'
---

270f1ffd19bccf799ece32ce136842edd69a333a