From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 11 Jun 2014 12:59:39 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec974c439724e8b4151412eaa0caba5aec5e1c49;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "Add optional second arg to unserialize()"
---

ec974c439724e8b4151412eaa0caba5aec5e1c49