Merge "Clean up MimeMagic singleton handling"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Nov 2013 20:15:12 +0000 (20:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 26 Nov 2013 20:15:12 +0000 (20:15 +0000)

Trivial merge