From: Stanislav Malyshev <stas@php.net>
Date: Wed, 16 May 2012 05:39:17 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~195
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a0212ea8859588988454abe2b23ee7b6e536da6;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  fd fix
  fix bug #61065

Conflicts:
	UPGRADING
---

6a0212ea8859588988454abe2b23ee7b6e536da6