From: Johannes Schlüter <johannes@php.net>
Date: Wed, 16 May 2012 14:41:23 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebe16343a28d5a4cda89907611eda5870bd60456;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  fd fix
  fix bug #61065 (cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68)
---

ebe16343a28d5a4cda89907611eda5870bd60456