From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 5 Jan 2017 17:42:58 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~638
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed74bb3a79e9c7741c5b2c9f1620d6a13e30caaa;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  wrong version

# Conflicts:
#	main/php_version.h
---

ed74bb3a79e9c7741c5b2c9f1620d6a13e30caaa