From: Stanislav Malyshev <stas@php.net>
Date: Tue, 24 Jun 2014 05:14:33 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~166^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b8cef7847f49ef142e6593fd9bb9172d18b073a;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Better fix for bug #67072 with more BC provisions
  Better fix for bug #67072 with more BC provisions

Conflicts:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
---

6b8cef7847f49ef142e6593fd9bb9172d18b073a