From: Stanislav Malyshev <stas@php.net>
Date: Sun, 18 Aug 2013 21:20:38 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~21^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf0c6f2858226d787bb8c7abe9d24a391df53d7a;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
---

bf0c6f2858226d787bb8c7abe9d24a391df53d7a
diff --cc NEWS
index 914b2a47e9,0d0a0530d2..cc469dd4d0
--- a/NEWS
+++ b/NEWS
@@@ -1,11 -1,6 +1,13 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.19
 +?? ??? 2013, PHP 5.5.3
 +
 +- Core:
++  . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
 +  . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van Hees)
 +
++
 +15 Aug 2013, PHP 5.5.2
  
  - Core:
    . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference