From: Anatoliy Belsky <ab@php.net>
Date: Wed, 4 Apr 2012 16:54:03 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69b2570b72a643f28135ebaf89ab1188d6cd7d45;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
  updated the NEWS with the latest fileinfo changes

Conflicts:
	NEWS
---

69b2570b72a643f28135ebaf89ab1188d6cd7d45