From: Remi Collet <remi@php.net>
Date: Tue, 10 Jun 2014 12:16:07 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.14RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6fee381becfc7caf7d9927c95ccaa16897cd811;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

f6fee381becfc7caf7d9927c95ccaa16897cd811