From: Nikita Popov <nikic@php.net>
Date: Tue, 14 Apr 2015 14:36:09 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed7e6d4758b8a8999b5e29e144e394782d473654;p=php

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

ed7e6d4758b8a8999b5e29e144e394782d473654
diff --cc NEWS
index 70e74d9c39,a71c3fca5b..9c90f3c8fe
--- a/NEWS
+++ b/NEWS
@@@ -9,7 -9,15 +9,9 @@@ PH
    . Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer).
      (Dmitry)
    . Fixed bug #68652 (segmentation fault in destructor). (Dmitry)
+   . Fixed bug #69419 (Returning compatible sub generator produces a warning).
+     (Nikita)
  
 -- cURL:
 -  . Fixed bug #68739 (Missing break / control flow). (Laruence)
 -
 -- Ereg:
 -  . Fixed bug #68740 (NULL Pointer Dereference). (Laruence)
 -
  - ODBC:
    . Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0).
      (Anatol)