]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 16:05:48 +0000 (17:05 +0100)
committerAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 16:05:48 +0000 (17:05 +0100)
* PHP-5.5:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
NEWS


Trivial merge