From: Remi Collet <remi@php.net>
Date: Tue, 10 Jun 2014 12:16:39 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC1~1^2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d6286c049cbe57877f12b17d38d3a55a7f7d36f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
---

1d6286c049cbe57877f12b17d38d3a55a7f7d36f