From: Anatol Belski <ab@php.net>
Date: Thu, 24 Apr 2014 17:33:54 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta2~1^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74ce9da5dcaa31a50bb2395df6200b191fdc0e41;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66307 Fileinfo crashes with powerpoint files

Conflicts:
	ext/fileinfo/libmagic/readcdf.c
---

74ce9da5dcaa31a50bb2395df6200b191fdc0e41