From: Jakub Zelenka <bukka@php.net>
Date: Sun, 6 Nov 2016 20:44:40 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC6~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e161b0f755fef3c3a7bf61ea8e500ece6f93132c;p=php

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

e161b0f755fef3c3a7bf61ea8e500ece6f93132c