From: Anatol Belski <ab@php.net>
Date: Thu, 5 Jan 2017 13:04:30 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~639^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=265b8cc18bdbef397452d50c40b9a1f60a9a6608;p=php

Merge branch 'PHP-7.1'

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

265b8cc18bdbef397452d50c40b9a1f60a9a6608