From: Stanislav Malyshev <stas@php.net>
Date: Thu, 13 Jun 2013 17:30:18 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~29^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e74776266fae4c9866cc4eb06d0f87405bda8411;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

e74776266fae4c9866cc4eb06d0f87405bda8411