From: Nikita Popov <nikic@php.net>
Date: Sat, 7 Jan 2017 21:54:16 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb2ab755555af61798c8584a166448119dcd9314;p=php

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

bb2ab755555af61798c8584a166448119dcd9314