From: Bob Weinand <bobwei9@hotmail.com>
Date: Thu, 13 Oct 2016 08:42:05 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' (-s ours)
X-Git-Tag: php-7.2.0alpha1~1145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e3707fafb47691de29bb35e175e95eb474b9bf8;p=php

Merge branch 'PHP-7.1' (-s ours)
---

2e3707fafb47691de29bb35e175e95eb474b9bf8