From: Anatol Belski <ab@php.net>
Date: Thu, 5 Jan 2017 00:54:53 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~643
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=032131f00b372673bcfd24232860048498bd1d44;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  quick fix for the base branch version parsing, not perfect still
---

032131f00b372673bcfd24232860048498bd1d44