From: Nikita Popov <nikic@php.net>
Date: Mon, 9 Jan 2017 22:29:33 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aab3f784d0cb79aee9fc46d0ba83b4993f72e695;p=php

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

aab3f784d0cb79aee9fc46d0ba83b4993f72e695