From: Julien Pauli <jpauli@php.net>
Date: Thu, 24 Dec 2015 09:33:41 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.3RC1~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f09d301b5e4b50825b4560f0dd6673dbe616fc5;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Update default_mimetype ini setting description
---

3f09d301b5e4b50825b4560f0dd6673dbe616fc5