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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
---

12a62ce868e9f83157ccd942d8e97c025d19f63c