From: Anatol Belski <ab@php.net>
Date: Tue, 19 Jul 2016 12:50:45 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta1~24^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6571a90f7fe0900efb18c96c923d241982ce3914;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix test portability and expectation
---

6571a90f7fe0900efb18c96c923d241982ce3914