Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo in bug#
  add CVE
  5.4.39 next

Conflicts:
	configure.in
	main/php_version.h

Author: Tyrael

NEWS

@@ -55,7 +55,7 @@ PHP                                                                        NEWS
   . Fixed bug #68711 (useless comparisons). (bugreports at internot dot info)
 
 - Enchant: 
-  . Fixed bug #6855 (heap buffer overflow in enchant_broker_request_dict()).
+  . Fixed bug #68552 (heap buffer overflow in enchant_broker_request_dict()).
     (Antony)
 
 - Fileinfo: