From: Nikita Popov <nikic@php.net>
Date: Wed, 2 Jul 2014 20:33:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c4156ed28e56b8b97e3ddfc7e4320f6103e7dbe;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

8c4156ed28e56b8b97e3ddfc7e4320f6103e7dbe
diff --cc NEWS
index 9bfa384e82,44196a3e1a..4f9ed4dd9f
--- a/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).