From: Stanislav Malyshev <stas@php.net>
Date: Thu, 13 Jun 2013 17:31:31 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~442^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3716599502fefe80b7f6cec7b781a27e1b32fbbf;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix test for bug #60322
---

3716599502fefe80b7f6cec7b781a27e1b32fbbf