From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Jan 2017 18:25:52 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~32^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70ca40d30fae08dc442a40e128bd9c3aa2e67808;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

70ca40d30fae08dc442a40e128bd9c3aa2e67808
diff --cc NEWS
index 699d05ced1,db6c8972f0..3673c94dbf
--- a/NEWS
+++ b/NEWS
@@@ -57,9 -47,9 +57,10 @@@ PH
      parameter). (Bruce Weirdan)
    . Fixed bug #70213 (Unserialize context shared on double class lookup).
      (Taoguang Chen)
+   . Fixed bug #73154 (serialize object with __sleep function crash). (Nikita)
 +  . Add subject to mail log. (tomsommer)
  
 -- Zlib:
 +- Zlib
    . Fixed bug #73373 (deflate_add does not verify that output was not truncated).
      (Matt Bonneau)