From: Remi Collet <remi@php.net>
Date: Tue, 18 Feb 2014 12:58:36 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa84d906d87f4774a6d036765de5e4c75fcb897f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
  NEWS
  NEWS
  Fixed Bug #66731 file: infinite recursion
---

aa84d906d87f4774a6d036765de5e4c75fcb897f