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

Merge branch 'PHP-5.5' into PHP-5.6

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

0a7e131128b880ba67ec5ca18409b85336c2874d