]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 18 Feb 2014 12:58:36 +0000 (13:58 +0100)
committerRemi Collet <remi@php.net>
Tue, 18 Feb 2014 12:58:36 +0000 (13:58 +0100)
commitaa84d906d87f4774a6d036765de5e4c75fcb897f
treefebe88a9ed85d9fd389a9bc56938852b720c65b8
parent140769a9d9c64042e5462388d2288c2da0ee02fc
parentbd8cd98d6d70ac50dc1de350970ed9ea479895db
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