Merge branch 'w46_MDL-30303_m22_mimeinfo' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 22 Nov 2011 23:17:14 +0000 (12:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 Nov 2011 23:17:14 +0000 (12:17 +1300)
commitb2d3e5cc493c382a1836f3f7c5c0c3b75d731756
tree480a213a520105d8eca424d43b0026688be284c8
parent15415bf8e8682e618f32774496872d9de95a37f2
parent7f86bee3303ca9210d56a2b36691de54d49b69c4
Merge branch 'w46_MDL-30303_m22_mimeinfo' of git://github.com/skodak/moodle