From: Stanislav Malyshev <stas@php.net>
Date: Tue, 8 Jul 2014 21:32:27 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~105^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=062f1482c31177304caceff28ac9da474e5df8aa;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix unstable test
---

062f1482c31177304caceff28ac9da474e5df8aa