From: Nikita Popov <nikic@php.net>
Date: Fri, 3 Oct 2014 19:42:11 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~59^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56da3638c445b506559febb50daa02a1403b3c44;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

56da3638c445b506559febb50daa02a1403b3c44
diff --cc NEWS
index 9df8ac2af0,8385d3e012..4ae2e28e8b
--- a/NEWS
+++ b/NEWS
@@@ -8,7 -16,6 +8,7 @@@ PH
    . Fixed bug #67633 (A foreach on an array returned from a function not doing
      copy-on-write). (Nikita)
    . Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
-   . Fixed bug #68188 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
++  . Fixed bug #68118 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
  
  - FPM:
    . Fixed bug #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable