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

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
---

d149ba217ff05a96e28a297ce60189b0a46fb32b