From: Anatoliy Belsky <ab@php.net>
Date: Mon, 2 Apr 2012 15:36:50 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=374646c36b07956da928e0583854002e55b4013e;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated the libmagic.patch
  Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
  Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
  - update to openssl 0.9.8u

Conflicts:
	ext/fileinfo/tests/finfo_open_001.phpt
	ext/fileinfo/tests/finfo_open_error.phpt
	win32/build/libs_version.txt
---

374646c36b07956da928e0583854002e55b4013e