From: Anatoliy Belsky <ab@php.net>
Date: Sun, 22 Apr 2012 17:30:26 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51aacf409f6338a29aec00f528cc231eeb971272;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61811 three of finfo tests failed, see also #61812.
---

51aacf409f6338a29aec00f528cc231eeb971272