Merge "Add image/pjpeg as an alias for image/jpeg"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 12 Jun 2015 22:15:44 +0000 (22:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 12 Jun 2015 22:15:44 +0000 (22:15 +0000)

Trivial merge