From: Anatoliy Belsky <ab@php.net>
Date: Tue, 10 Apr 2012 12:55:38 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06b2d66ce259372883e0742be3930a3a10494261;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails

Conflicts:
	ext/standard/tests/file/file_put_contents_variation8-win32.phpt
---

06b2d66ce259372883e0742be3930a3a10494261