- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5