From: Remi Collet <remi@php.net>
Date: Wed, 28 Nov 2012 09:23:50 +0000 (+0100)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.6.0alpha1~687
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c7c11c2cc2b1fe5eadd7a65f97384877c07d5f0;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)
---

6c7c11c2cc2b1fe5eadd7a65f97384877c07d5f0