From: Anatol Belski <ab@php.net>
Date: Fri, 6 Nov 2015 22:10:40 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~857
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=655e266440bc65d2b3b6c69b433fc9b6e70aa4da;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  fix decrement_function regarding bug #70863
  Fixed bug #70863 Incorect logic to increment_function for proxy objects
  no more dev ZEND_VERSION
  Add support for IPV6_V6ONLY on sockets

Conflicts:
	Zend/zend.h
---

655e266440bc65d2b3b6c69b433fc9b6e70aa4da