]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27d46a4 44a2ae0)
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Fri, 4 Oct 2013 17:51:36 +0000 (10:51 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 4 Oct 2013 17:51:36 +0000 (10:51 -0700)
* 'master' 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


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