]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Tue, 25 Jun 2013 21:00:47 +0000 (18:00 -0300)
committerFelipe Pena <felipensp@gmail.com>
Tue, 25 Jun 2013 21:00:47 +0000 (18:00 -0300)
* PHP-5.5:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN


Trivial merge