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

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61460 popen_close_error-win32 expected output is wrong

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

827c446b62ecab6e92b93a9184ba28e581b4d882