From: Julien Pauli <jpauli@php.net>
Date: Thu, 24 Dec 2015 09:33:49 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a882d0fd7bc3238f59a4bb3d3f3d9e86ec5c3fe1;p=php

Merge branch 'PHP-7.0'

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

a882d0fd7bc3238f59a4bb3d3f3d9e86ec5c3fe1