]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3ef019 232ab8d)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 24 Jun 2014 05:14:33 +0000 (22:14 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 24 Jun 2014 05:15:01 +0000 (22:15 -0700)
* PHP-5.5:
  Better fix for bug #67072 with more BC provisions
  Better fix for bug #67072 with more BC provisions

Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re


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