From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 2 Aug 2016 09:40:47 +0000 (+0800)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1558^2~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4bb4b13c5c2edb19c4211a29446a035f775c1ce3;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Optimized array_merge
  prepare next
  fix php_version.h
---

4bb4b13c5c2edb19c4211a29446a035f775c1ce3