From: Stanislav Malyshev Date: Mon, 23 Mar 2015 03:35:35 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~541 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b9fcc4d0dd8b31c6c988e7a29ec6d78d63eb334;p=php Merge branch 'PHP-5.6' * PHP-5.6: Renamed test case to match with reported bug Fixed serialization of non string values on __sleep Conflicts: ext/standard/var.c --- 3b9fcc4d0dd8b31c6c988e7a29ec6d78d63eb334