Merge "Remove dead mime_content_type() code paths"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Sep 2014 23:40:53 +0000 (23:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Sep 2014 23:40:53 +0000 (23:40 +0000)
1  2 
includes/DefaultSettings.php

Simple merge