From: Remi Collet <remi@php.net>
Date: Thu, 5 Jun 2014 15:34:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~239^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b16950b5d32df8cc885f5b46c752ddf5c4f48c0d;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test for 5.4/5.5
---

b16950b5d32df8cc885f5b46c752ddf5c4f48c0d