From: Anatol Belski <ab@php.net>
Date: Fri, 29 Jan 2016 20:46:15 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.2.0alpha1~620^2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=620f4169a7a281b3c6c7d97cd455395d8374bb52;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  yet one revert
  Revert "adjust test for 7.0"

Conflicts:
	ext/session/tests/bug69111.phpt
---

620f4169a7a281b3c6c7d97cd455395d8374bb52