From: Julien Pauli <jpauli@php.net>
Date: Tue, 7 Jul 2015 14:03:37 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta1~12^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcd6bc46f493fd294eb8f7bf6bcab630ffb0cd6b;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix test related to c22da81

Conflicts:
	ext/standard/tests/general_functions/bug41037.phpt
---

bcd6bc46f493fd294eb8f7bf6bcab630ffb0cd6b