From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 1 Dec 2016 13:22:23 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96655ad01e64abaa8275328b9924d7d52dc1a5a6;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bad merge
---

96655ad01e64abaa8275328b9924d7d52dc1a5a6