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)
commitc4c1d277ee138892b7117800a4b88dfca25e3d24
treed16edf3cdd1a54547b3431d1de79033c46a6dd1a
parent5b74a93eff8d3ead5cb1c21ca38391ecb39a9575
parent32cc74a0411d3bf09e839ee280a1adc42d4528e0
Merge "Add image/pjpeg as an alias for image/jpeg"