From: Stanislav Malyshev <stas@php.net>
Date: Thu, 26 Jun 2014 17:40:36 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC2~1^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d81a1c354923bf134b1a65088e26ec30c2205a0;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  more extensive note on unserialize() change
  more extensive note on unserialize() change
---

1d81a1c354923bf134b1a65088e26ec30c2205a0