From: Christopher Jones <sixd@php.net>
Date: Wed, 26 Jun 2013 00:28:12 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.2RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99ab8a83af7c027d09336a3672ad562917ae2966;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
---

99ab8a83af7c027d09336a3672ad562917ae2966