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

Merge branch 'PHP-5.4' into PHP-5.5

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

2d59b87527f1df6101f56e99c20a687afb19b281