Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add NEWS
  Patch commit d9f85373e32 by moving the float_to_double function to a header file.
  Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).

Conflicts:
	ext/mysqlnd/config9.m4

diff --cc NEWS
index 01621236eb15f1ab53db7f21b96d13956131bd3c,2a25af0775be5fd87d1ebf16816963177c2e17d8..cec955c5729489616669987ce528323e88417074
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -28,7 -25,13 +28,13 @@@
    . Fixed bug #68260 (SQLite3Result::fetchArray declares wrong 
      required_num_args). (Julien)
  
 -22 Jan 2015, PHP 5.5.21
+ - Mysqli:
+   . Fixed bug #68114 (linker error on some OS X machines with fixed
+     width decimal support) (Keyur Govande)
+   . Fixed bug #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
+     has rounding errors) (Keyur Govande)
+ 
 +22 Jan 2015, PHP 5.6.5
  
  - Core:
    . Upgraded crypt_blowfish to version 1.3. (Leigh)