Merge "Fix mime detection of easily-confused-with text/plain formats"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Fri, 4 Jul 2014 07:43:42 +0000 (07:43 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 4 Jul 2014 07:43:42 +0000 (07:43 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 4 Jul 2014 07:43:42 +0000 (07:43 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 4 Jul 2014 07:43:42 +0000 (07:43 +0000)
diff --cc includes/MimeMagic.php
Simple merge
diff --cc includes/mime.info
Simple merge
diff --cc includes/mime.types
Simple merge
diff --cc includes/upload/UploadBase.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 4 Jul 2014 07:43:42 +0000 (07:43 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 4 Jul 2014 07:43:42 +0000 (07:43 +0000)
		1	2
includes/MimeMagic.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/mime.info	patch \|	diff1 \|	diff2 \|	blob \| history
includes/mime.types	patch \|	diff1 \|	diff2 \|	blob \| history
includes/upload/UploadBase.php	patch \|	diff1 \|	diff2 \|	blob \| history