From: Stanislav Malyshev <stas@php.net>
Date: Tue, 8 Jul 2014 21:31:40 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0RC3~1^2~55^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f559976be64726c718fe5a9a189763c4abafbf87;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix unstable test
---

f559976be64726c718fe5a9a189763c4abafbf87