Merge branch 'PHP-5.4' into PHP-5.5

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

diff --cc NEWS
index 914b2a47e9ed0d9ef41a49e98d5da00dad2c585b,0d0a0530d21e6e383b333a74f8ba04061e56580b..cc469dd4d013a429a6edc677f7422ac78b509b40
--- 1/NEWS
--- 2/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

diff --cc main/main.c
Simple merge