From: Stanislav Malyshev <stas@php.net>
Date: Wed, 10 Jun 2015 00:12:11 +0000 (-0700)
Subject: Merge branch 'PHp-5.4' into PHP-5.5
X-Git-Tag: php-5.5.27RC1~9^2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b53b7cd84bfb127b774b3d2de2bf215efd6eac1;p=php

Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
  fix test
  update NEWS
---

6b53b7cd84bfb127b774b3d2de2bf215efd6eac1