From: Anatol Belski <ab@php.net>
Date: Thu, 5 Jan 2017 13:02:43 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34c1040e2218dfb54649c2bbd0ef958a5826454e;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
---

34c1040e2218dfb54649c2bbd0ef958a5826454e