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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
---

e61f7727d455e50b69111a6f0d90e54cc79d6947