From: Ferenc Kovacs <tyrael@php.net>
Date: Fri, 25 Jul 2014 11:16:31 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03dcdf5742e56abe305809ea233ba41301fddc16;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
---

03dcdf5742e56abe305809ea233ba41301fddc16