From: Remi Collet <remi@php.net>
Date: Wed, 19 Dec 2012 09:25:05 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=828bb4d44d9d07cb2510dc0bced1da931b78791c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix failing test on Linux build
---

828bb4d44d9d07cb2510dc0bced1da931b78791c