From: ULF WENDEL <uw@php.net>
Date: Sat, 29 Sep 2012 16:55:42 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.4.9RC1~22^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e2222f0283adc665b82a31900b162a425dc0108;p=php

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  Fixed bug #63248 Load multiple magic files on win
---

5e2222f0283adc665b82a31900b162a425dc0108