From: Stanislav Malyshev <stas@php.net>
Date: Tue, 21 Jun 2016 07:28:17 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha2~22^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c389e842922b5a6a5030f46fb4e24dcd1dc4ae9;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Now the right bug #
  Fix NEWS

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

7c389e842922b5a6a5030f46fb4e24dcd1dc4ae9