Merge branch 'm28_MDL-46985_7ZIP_RAR_MIME_types_missing' of https://github.com/scara...
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:33:54 +0000 (15:33 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:33:54 +0000 (15:33 +0800)

Trivial merge