From: Anatol Belski <ab@php.net>
Date: Sat, 13 May 2017 23:54:18 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha2~15^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5587adc158982425cf8d45d275c811526a6ccbb9;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  revert workaround for bug #74489 as it's fixed in the dependency lib
---

5587adc158982425cf8d45d275c811526a6ccbb9