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

Merge branch 'PHP-7.0'

* PHP-7.0:
  refix #69111 and one related test

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

1a9402c6ec7cbb98c8774bebdd7f576d6b822a7d