From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 3 Dec 2016 13:18:56 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c20299ddc45abb10036e0b32a64e0b222901e48c;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

c20299ddc45abb10036e0b32a64e0b222901e48c