From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 1 Apr 2015 20:08:11 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~79^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faab4301417517c2c83910101a37a9ed53eb57e1;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  test fixes
---

faab4301417517c2c83910101a37a9ed53eb57e1