From: Stanislav Malyshev <stas@php.net>
Date: Fri, 25 Apr 2014 06:59:32 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.13RC1~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6841d250af9398ee549508a004dc74c62cf73e7;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

f6841d250af9398ee549508a004dc74c62cf73e7