From: Stanislav Malyshev <stas@php.net>
Date: Tue, 17 Feb 2015 06:10:30 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70e51db21026eaedc985278692651aeb0a454a86;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  update news
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN

Conflicts:
	ext/date/php_date.c
---

70e51db21026eaedc985278692651aeb0a454a86