From: Sara Golemon <pollita@php.net>
Date: Tue, 23 May 2017 23:29:11 +0000 (-0700)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~57^2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92056aee85aff6d6fafe785d063844bfd97ad7b2;p=php

Merge branch 'PHP-7.1'

7.1.x release shouldn't have been pn mainline PHP-7.1 branch
Fix the merge history to keep master in place.

* PHP-7.1:
  bump versions
---

92056aee85aff6d6fafe785d063844bfd97ad7b2