From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 2 Aug 2016 09:40:37 +0000 (+0800)
Subject: Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
X-Git-Tag: php-7.1.0beta2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87057858a0475fd4845ff2b10304702f919b9049;p=php

Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  prepare next
  fix php_version.h
---

87057858a0475fd4845ff2b10304702f919b9049