Merge "mime.types: allow bzip2 upload"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Apr 2015 20:33:43 +0000 (20:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Apr 2015 20:33:43 +0000 (20:33 +0000)

Trivial merge