Merge "Less false positives for MEDIATYPE_VIDEO"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 29 Jun 2014 23:40:20 +0000 (23:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 29 Jun 2014 23:40:20 +0000 (23:40 +0000)
1  2 
includes/MimeMagic.php

Simple merge