Merge branch 'w46_MDL-30303_m22_mimeinfo' of git://github.com/skodak/moodle