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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
---

9ee147e6ff970e317b2743b6679dbaca7c875b65