Merge branch 'PHP-5.4' into PHP-5.5

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

diff --cc NEWS
index 89bb30a82b6dac7336cb06d71e7637dc8cff1b71,3fb47817f0b163f00b171dc753e2507d7f8a7e20..122d7faf25a8f3a05c7b68a6d32f2572283613a3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -20,10 -18,10 +20,14 @@@ PH
  - FPM:
    . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi)
  
 -  . Fixed bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting). 
+ - Intl:
++  . 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)