From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 3 Dec 2016 22:42:29 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca871aaba6da64866a67d35ec1fb34066cf92e5b;p=php

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

ca871aaba6da64866a67d35ec1fb34066cf92e5b