From: Christopher Jones <sixd@php.net>
Date: Fri, 4 Oct 2013 17:51:04 +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.5~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb6f5d2e2d44e205cdde7320a7674e43fdd7980b;p=php

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

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fix bug #65667: ftp_nb_continue produces segfault
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
  such a weird hack probably helps in finding regressions in the future
---

fb6f5d2e2d44e205cdde7320a7674e43fdd7980b