]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Thu, 26 Jun 2014 17:36:38 +0000 (10:36 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 26 Jun 2014 17:36:38 +0000 (10:36 -0700)
* PHP-5.4:
  more extensive note on unserialize() change


Trivial merge