]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 17 Apr 2014 09:07:22 +0000 (11:07 +0200)
committerAnatol Belski <ab@php.net>
Thu, 17 Apr 2014 09:07:22 +0000 (11:07 +0200)
* PHP-5.5:
  updated NEWS
  Fixed bug #67072 Echoing unserialized "SplFileObject" crash


Trivial merge