From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Fri, 6 Jan 2017 00:50:08 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ed188011af1758d8e3171886b232b562576f244;p=php

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

1ed188011af1758d8e3171886b232b562576f244