]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92c87b0 83bc4fb)
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Wed, 26 Jun 2013 00:28:27 +0000 (17:28 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 26 Jun 2013 00:28:27 +0000 (17:28 -0700)
# By Felipe Pena
# Via Felipe Pena (8) and Christopher Jones (3)
* 'master' 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.