From: Stanislav Malyshev <stas@php.net>
Date: Fri, 25 Apr 2014 07:00:20 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta2~1^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bad4aa355943b1b680f23ae5a3c6a18360d0fa8;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
---

1bad4aa355943b1b680f23ae5a3c6a18360d0fa8