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

diff --git a/includes/mime.info b/includes/mime.info
index 243e280..840b9d8 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -9,7 +9,7 @@
 image/gif      [BITMAP]
 image/png image/x-png  [BITMAP]
 image/ief      [BITMAP]
-image/jpeg     [BITMAP]
+image/jpeg image/pjpeg [BITMAP]
 image/jp2      [BITMAP]
 image/xbm      [BITMAP]
 image/tiff     [BITMAP]