From: Felipe Pena <felipensp@gmail.com>
Date: Tue, 25 Jun 2013 21:00:42 +0000 (-0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~24^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=adb116dd485752cc765b8018907d9040b212becf;p=php

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
---

adb116dd485752cc765b8018907d9040b212becf