]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Tue, 18 Feb 2014 12:58:48 +0000 (13:58 +0100)
committerRemi Collet <remi@php.net>
Tue, 18 Feb 2014 12:58:48 +0000 (13:58 +0100)
commite32b54578a79df81aefe443135b6b3155bb39c44
treef0a6d4344bd931232b5a904f755c6e00acea2693
parent8862a4d98de6c99568fcedebafb661e286b8fcf2
parentaa84d906d87f4774a6d036765de5e4c75fcb897f
Merge branch 'PHP-5.6'

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