Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Keep 308-399 HTTP response codes when header('Location:') is called.

diff --cc NEWS
index 8b1feba7c3bdb92db53990507638e4d52812c7fb,6d6c461bc94b3c6777fb8d514459a66831fa7807..6d7a7e69599e2476d2ae0221bff6909efc8e9aba
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.4.31
 +?? ??? 2014, PHP 5.5.15
  
 -?? ??? 2014, PHP 5.4.30
+ - Core:
+   . Fixed bug #67428 (header('Location: foo') will override a 308-399 response
+     code). (Adam)
+ 
 +?? ??? 2014, PHP 5.5.14
  
  - Core:
    . Fixed BC break introduced by patch for bug #67072. (Anatol)