]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 15:55:47 +0000 (16:55 +0100)
committerAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 15:55:47 +0000 (16:55 +0100)
commitf094723852b0ac8dbb2767a385bbe6653b4d444f
tree13a4da0fe8558b5bbefe004eb88dd524af699ca5
parent17e21925c8378637d5993182e02143798a861306
parentd88017e992d03dc6909b1a1c120668b90f52ae39
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
NEWS