From: Stanislav Malyshev <stas@php.net>
Date: Mon, 7 Jul 2014 07:37:24 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ddf9a2dc4f526821b794cc0b6f537d2cc013d27;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
---

8ddf9a2dc4f526821b794cc0b6f537d2cc013d27
diff --cc NEWS
index 89bb30a82b,3fb47817f0..122d7faf25
--- a/NEWS
+++ b/NEWS
@@@ -20,10 -18,10 +20,14 @@@ PH
  - FPM:
    . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi)
  
+ - Intl:
 -  . Fixed bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting). 
++  . Fixed bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting).
+     (Stas)
+ 
 +- OPCache:
 +  . Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault
 +    happen) (Dmitry, Laruence)
 +
  - pgsql:
    . Fix bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
      which affected builds against libpq < 7.3. (Adam)