]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 140769a bd8cd98)
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)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.