Merge "mime.types: allow bzip2 upload"

diff --git a/includes/mime.info b/includes/mime.info
index 07b2495..243e280 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -72,6 +72,7 @@ text/tab-separated-values     [TEXT]
 application/zip application/x-zip      [ARCHIVE]
 application/x-gzip     [ARCHIVE]
 application/x-bzip     [ARCHIVE]
+application/x-bzip2    [ARCHIVE]
 application/x-tar      [ARCHIVE]
 application/x-stuffit  [ARCHIVE]
 application/x-opc+zip  [ARCHIVE]

diff --git a/includes/mime.types b/includes/mime.types
index 75017db..210610a 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -21,7 +21,8 @@ application/vnd.wap.wmlc wmlc
 application/vnd.wap.wmlscriptc wmlsc
 application/voicexml+xml vxml
 application/x-bcpio bcpio
-application/x-bzip gz bz2
+application/x-bzip bz
+application/x-bzip2 bz2
 application/x-cdlink vcd
 application/x-chess-pgn pgn
 application/x-cpio cpio