]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b62eec6 3e7f47c)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 03:35:35 +0000 (20:35 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 03:35:35 +0000 (20:35 -0700)
* PHP-5.6:
  Renamed test case to match with reported bug
  Fixed serialization of non string values on __sleep

Conflicts:
ext/standard/var.c


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