From: Anatoliy Belsky <ab@php.net>
Date: Tue, 8 May 2012 17:36:15 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fce7fe885d818d667b69ac40595f7e8b106307e;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
---

5fce7fe885d818d667b69ac40595f7e8b106307e