From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 12 Jun 2015 22:15:44 +0000 (+0000)
Subject: Merge "Add image/pjpeg as an alias for image/jpeg"
X-Git-Tag: 1.31.0-rc.0~11101
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=c4c1d277ee138892b7117800a4b88dfca25e3d24;p=lhc%2Fweb%2Fwiklou.git

Merge "Add image/pjpeg as an alias for image/jpeg"
---

c4c1d277ee138892b7117800a4b88dfca25e3d24