From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Wed, 3 Aug 2016 23:42:00 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta3~114^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db4211a8fee3079d5b53c6673c75afe41eb6a8f6;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	configure.in
	main/php_version.h
---

db4211a8fee3079d5b53c6673c75afe41eb6a8f6