Merge branch 'PHP-5.4' into PHP-5.5

diff --cc NEWS
index 9bfa384e8252f7cf3630567f794a42e933a654e2,44196a3e1a6617f29a7dfa4d2ff323b11f99e26f..4f9ed4dd9feb042f1d49aad90664c2725a89babc
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -9,8 -9,7 +9,9 @@@ PH
      match). (Bob)
    . Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
      (Ferenc)
-   . Fixed buf #67497 (eval with parse error causes segmentation fault in
++  . Fixed bug #67497 (eval with parse error causes segmentation fault in
 +    generator). (Nikita)
+   . Fixed bug #67151 (strtr with empty array crashes). (Nikita)
  
  - CLI server:
    . Implemented FR #67429 (CLI server is missing some new HTTP response codes).

diff --cc ext/standard/string.c
Simple merge